commit 55232e32c73b114dbe8de643ff0f352e252457ac Merge: b5ce332 b34c5c6 Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 7 09:43:24 2016 -0800

Merge branch 'maint-0.2.7'

changes/bug17906 | 4 ++++ src/or/config.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

diff --cc src/or/config.c index ff25a79,3b35b5a..c1db844 --- a/src/or/config.c +++ b/src/or/config.c @@@ -914,10 -873,9 +914,10 @@@ static const char *default_authorities[ "82.94.251.203:80 4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D", "gabelmoo orport=443 " "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 " + "ipv6=[2001:638:a000:4140::ffff:189]:443 " "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281", "dannenberg orport=443 " - "v3ident=585769C78764D58426B8B52B6651A5A71137189A " + "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", "urras orport=80 " "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C "