summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-07-05 12:22:47 -0400
committerNick Mathewson <nickm@torproject.org>2016-07-05 12:22:47 -0400
commit6e96aadadbe9ac49582c770e9ff11b3c2876abf3 (patch)
tree6765b69fa0cdcc7c7ecf65d9a03c9e0518c7a003
parent80089c9e7c16f38e398e99cbc773c3182cee9229 (diff)
parentc28ba994ec95f4f669ad5131f36b0f9f1cc53782 (diff)
downloadtor-6e96aadadbe9ac49582c770e9ff11b3c2876abf3.tar.gz
tor-6e96aadadbe9ac49582c770e9ff11b3c2876abf3.zip
Merge branch 'maint-0.2.6' into maint-0.2.7
-rw-r--r--src/or/config.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 3b35b5a8d7..0f36738ad6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -877,9 +877,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",
"maatuska orport=80 "
"v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
"171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",