diff options
author | Nick Mathewson <nickm@torproject.org> | 2019-08-19 10:37:21 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2019-08-19 10:37:21 -0400 |
commit | 2ecd36f3c31378a8283d25a97ab81f01f2c52b2f (patch) | |
tree | 50f8ed132f1f83a2675b5965f713b7f0cb09dfea | |
parent | 552688c5ccf23f48582a804a01f972e8fc715c8f (diff) | |
parent | 90f4ed2335fee8bba6e232c6d92078cb133f5b9e (diff) | |
download | tor-2ecd36f3c31378a8283d25a97ab81f01f2c52b2f.tar.gz tor-2ecd36f3c31378a8283d25a97ab81f01f2c52b2f.zip |
Merge branch 'maint-0.4.0' into release-0.4.0
-rw-r--r-- | changes/ticket31406 | 3 | ||||
-rw-r--r-- | src/app/config/auth_dirs.inc | 2 |
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/app/config/auth_dirs.inc b/src/app/config/auth_dirs.inc index 08a919b053..278f08bfcf 100644 --- a/src/app/config/auth_dirs.inc +++ b/src/app/config/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 " |