diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:21:15 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-02-07 09:21:15 -0500 |
commit | 535e03400419340c3bed2af5fa810308727293c5 (patch) | |
tree | fca0aae2e889663efad0ab9ccee9c2c880fff146 | |
parent | 56451e8b98ac621ae45847762a3d2befe322de44 (diff) | |
parent | c6f2ae514eb2713d386bedac2f7e71ed04385026 (diff) | |
download | tor-535e03400419340c3bed2af5fa810308727293c5.tar.gz tor-535e03400419340c3bed2af5fa810308727293c5.zip |
Merge branch 'maint-0.2.6' into release-0.2.6
-rw-r--r-- | changes/bifroest | 3 | ||||
-rw-r--r-- | src/or/config.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/changes/bifroest b/changes/bifroest new file mode 100644 index 0000000000..41af658ed8 --- /dev/null +++ b/changes/bifroest @@ -0,0 +1,3 @@ + o Directory authority changes (also in 0.2.8.7): + - The "Tonga" bridge authority has been retired; the new bridge + authority is "Bifroest". Closes tickets 19728 and 19690. diff --git a/src/or/config.c b/src/or/config.c index 89b6087814..233940ec95 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -859,8 +859,8 @@ add_default_trusted_dir_authorities(dirinfo_type_t type) "dizum orport=443 " "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 " "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", + "Bifroest orport=443 bridge " + "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", |