diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:23:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-07-05 12:23:35 -0400 |
| commit | 803fa75f7f5a8bc5b94aebfc5be81d5a05d679b4 (patch) | |
| tree | 754b613daeabcf3572d0e781adf62e511faea0dd | |
| parent | 017245074e3a2c1c7ad4375911a586367e036b04 (diff) | |
| parent | f4408747d3e8de35f6beaf37535315b907c87656 (diff) | |
| download | tor-803fa75f7f5a8bc5b94aebfc5be81d5a05d679b4.tar.gz tor-803fa75f7f5a8bc5b94aebfc5be81d5a05d679b4.zip | |
Merge branch 'maint-0.2.8' into release-0.2.8
| -rw-r--r-- | src/or/config.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index 0850013d33..908f098ce7 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -919,11 +919,6 @@ 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 " |