tor

commit 746410fb24055db0046a6d70986efcc6e3d10281
parent 23c5259a384b435c76b5cae40f68f07aec34d241
Author: Nick Mathewson <nickm@torproject.org>
Date:   Wed, 20 Sep 2017 08:32:55 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

Diffstat:
A
changes/longclaw-ipv6
 | 
6
++++++
M
src/or/config.c
 | 
1
-

2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/changes/longclaw-ipv6 b/changes/longclaw-ipv6
@@ -0,0 +1,6 @@
+  o Minor features (directory authorities):
+    - Remove longclaw's IPv6 address, as it will soon change.
+      Authority IPv6 addresses were originally added in 0.2.8.1-alpha.
+      This leaves 3/8 directory authorities with IPv6 addresses, but there
+      are also 52 fallback directory mirrors with IPv6 addresses.
+      Resolves 19760.
diff --git a/src/or/config.c b/src/or/config.c
@@ -1037,7 +1037,6 @@ static const char *default_authorities[] = {
     "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
   "longclaw orport=443 "
     "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
-    "ipv6=[2620:13:4000:8000:60:f3ff:fea1:7cff]:443 "
     "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   NULL
 };