diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-11-12 15:29:39 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-11-12 15:30:11 -0500 |
| commit | 6c146f9c83e24dc3ae74f56f93d4e7caf570e98b (patch) | |
| tree | 079048d084f73fa4772b983fcb7d085401cb5d94 | |
| parent | 9e2608b0d35e7e890e53f83e40675851caff4a14 (diff) | |
| parent | 0493db4adb88b830b4339d320b96a88fc27a01bb (diff) | |
| download | tor-6c146f9c83e24dc3ae74f56f93d4e7caf570e98b.tar.gz tor-6c146f9c83e24dc3ae74f56f93d4e7caf570e98b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4' into maint-0.2.5
Conflicts:
src/or/config.c
| -rw-r--r-- | changes/bug13296 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/changes/bug13296 b/changes/bug13296 new file mode 100644 index 0000000000..d6fe038c30 --- /dev/null +++ b/changes/bug13296 @@ -0,0 +1,5 @@ + o Directory authority changes: + - Remove turtles as a directory authority. + - Add longclaw as a new (v3) directory authority. This implements + ticket 13296. This keeps the directory authority count at 9. + diff --git a/src/or/config.c b/src/or/config.c index 39b85aa1ab..89ea58677a 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -858,9 +858,6 @@ 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 82.94.251.203:80 " "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", - "turtles orport=9090 " - "v3ident=27B6B5996C426270A5C95488AA5BCEB6BCC86956 " - "76.73.17.194:9030 F397 038A DC51 3361 35E7 B80B D99C A384 4360 292B", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", @@ -875,6 +872,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 " "154.35.32.5:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", + "longclaw orport=443 " + "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " + "202.85.227.202:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL }; for (i=0; authorities[i]; i++) { |