tor

commit 16381b579ecd2a050d117765d51ead4b3c3ebbb9
parent d84581a3e677a6905125b619c590488c12a36ae8
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Jun 2018 09:44:17 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

Diffstat:
A
changes/ticket26343
 | 
3
+++
M
src/or/auth_dirs.inc
 | 
1
+

2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/changes/ticket26343 b/changes/ticket26343
@@ -0,0 +1,3 @@
+  o Minor features (directory authority):
+    - Add an IPv6 address for the "dannenberg" directory
+      authority. Closes ticket 26343.
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
@@ -16,6 +16,7 @@
   "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 "dannenberg orport=443 "
   "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
+  "ipv6=[2001:678:558:1000::244]:443 "
   "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 "maatuska orport=80 "
   "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "