diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-12-16 10:05:07 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-12-16 10:05:07 -0500 |
| commit | 591f65dde68c7847e4282c4cba5a11868fe13158 (patch) | |
| tree | 14b23f52459a7341e0ca0b0cd4e03291f1fcdde7 /src | |
| parent | ddfb398494ddf9d514a3ff16ade69c619c659ce7 (diff) | |
| parent | 3c3b1d14fd1031c244c62fd16dac0dff53cb069f (diff) | |
| download | tor-591f65dde68c7847e4282c4cba5a11868fe13158.tar.gz tor-591f65dde68c7847e4282c4cba5a11868fe13158.zip | |
Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c index e3d5e606f9..280acc0ca5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -787,9 +787,9 @@ add_default_trusted_dir_authorities(authority_type_t type) "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", - "gabelmoo orport=8080 no-v2 " + "gabelmoo orport=443 no-v2 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " - "80.190.246.100:8180 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", + "212.112.245.170:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 no-v2 " "v3ident=585769C78764D58426B8B52B6651A5A71137189A " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", |