summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-12 09:44:17 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-12 09:44:17 -0400
commit03f3ee6d74d548b1f8ed10c475f450977c518b34 (patch)
tree5aab2f53b48fcde3b463c2f52a80c5d1b2af9379
parentb13fe14cb0fca9f747ca4f83fbde3e5cc3fa0576 (diff)
parenteaa359650cd4654744f8750ee6a59d8653e96147 (diff)
downloadtor-03f3ee6d74d548b1f8ed10c475f450977c518b34.tar.gz
tor-03f3ee6d74d548b1f8ed10c475f450977c518b34.zip
Merge branch 'maint-0.3.3'
-rw-r--r--changes/ticket263433
-rw-r--r--src/or/auth_dirs.inc1
2 files changed, 4 insertions, 0 deletions
diff --git a/changes/ticket26343 b/changes/ticket26343
new file mode 100644
index 0000000000..ab5f332ee6
--- /dev/null
+++ 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
index 58e6817c86..e0937541ea 100644
--- 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 "