tor

commit 4bb287aa39d74e99dc319cd0a3fde88419340848
parent a7e777ab8ef6063f3811be58e152269ad38b9143
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 27 Nov 2017 09:09:34 -0500

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
A
changes/bastet_v6
 | 
4
++++
M
src/or/config.c
 | 
1
+

2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/changes/bastet_v6 b/changes/bastet_v6
@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+    - Add an IPv6 address for the "bastet" directory authority.
+      Closes ticket 24394.
+
diff --git a/src/or/config.c b/src/or/config.c
@@ -1079,6 +1079,7 @@ static const char *default_authorities[] = {
     "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
   "bastet orport=443 "
     "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+    "ipv6=[2620:13:4000:6000::1000:118]:443 "
     "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };