diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-04-04 21:05:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-04-04 21:05:42 -0400 |
| commit | 15ac8c5711fdbf5f1327368be20e62776ccda45f (patch) | |
| tree | bd32fd23e744b34ed4f9666680d0ce5a84dc4dad /src/or/config.c | |
| parent | b8e582255e8ee920904c71ed9d4ff3927f22757a (diff) | |
| parent | 439fc704f14af50364bee5d3cd91a2bca0d8611a (diff) | |
| download | tor-15ac8c5711fdbf5f1327368be20e62776ccda45f.tar.gz tor-15ac8c5711fdbf5f1327368be20e62776ccda45f.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index 24edc4d793..8cbdf9b8a8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -919,8 +919,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755", "Tonga orport=443 bridge no-v2 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "ides orport=9090 no-v2 v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "216.224.124.114:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", + "turtles orport=9090 no-v2 " + "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " + "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", |