commit f4408747d3e8de35f6beaf37535315b907c87656 Merge: 744077d 6e96aad Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 12:23:14 2016 -0400

Merge branch 'maint-0.2.7' into maint-0.2.8

src/or/config.c | 5 ----- 1 file changed, 5 deletions(-)

diff --cc src/or/config.c index 0850013,0f36738..908f098 --- a/src/or/config.c +++ b/src/or/config.c @@@ -919,14 -877,8 +919,9 @@@ static const char *default_authorities[ "dannenberg orport=443 " "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E " "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123", - "urras orport=80 " - "v3ident=80550987E1D626E3EBA5E5E75A458DE0626D088C " - "208.83.223.34:443 0AD3 FA88 4D18 F89E EA2D 89C0 1937 9E0E 7FD9 4417" - /* XX/teor - urras may have an IPv6 address, but it's not in urras' - * descriptor as of 11 Dec 2015. See #17813. */, "maatuska orport=80 " "v3ident=49015F787433103580E3B66A1707A00E60F2D15B " + "ipv6=[2001:67c:289c::9]:80 " "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810", "Faravahar orport=443 " "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "