aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-08-19 10:37:21 -0400
committerNick Mathewson <nickm@torproject.org>2019-08-19 10:37:21 -0400
commitba7079fddf282f70085c3879c4e192f1af8bb578 (patch)
treeefa547e6c198e14dc3908b3dbbf75b515a069911
parentf65c123519f72da8f76c8f4d470165b07a86e6c1 (diff)
parent5a1c3e44f758cda18bb0a0a8ef7c94a0122c85e4 (diff)
downloadtor-ba7079fddf282f70085c3879c4e192f1af8bb578.tar.gz
tor-ba7079fddf282f70085c3879c4e192f1af8bb578.zip
Merge branch 'maint-0.2.9' into release-0.2.9
-rw-r--r--changes/ticket314063
-rw-r--r--src/or/auth_dirs.inc2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/ticket31406 b/changes/ticket31406
new file mode 100644
index 0000000000..0ebe6f6c47
--- /dev/null
+++ b/changes/ticket31406
@@ -0,0 +1,3 @@
+ o Minor features (directory authority):
+ - A new IP address the directory authority "dizum" has been changed. Closes
+ ticket 31406;
diff --git a/src/or/auth_dirs.inc b/src/or/auth_dirs.inc
index 08a919b053..278f08bfcf 100644
--- a/src/or/auth_dirs.inc
+++ b/src/or/auth_dirs.inc
@@ -7,7 +7,7 @@
"86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
"dizum orport=443 "
"v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
- "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
+ "45.66.33.45:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
"Serge orport=9001 bridge "
"66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533",
"gabelmoo orport=443 "