summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-23 08:59:11 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-23 08:59:11 -0400
commitdf57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d (patch)
tree62fa3409ebb3a1f0e14d08eda7539bb019cc1f03
parentb68de63eb614061b33a84feb61804745b397a87d (diff)
parent783e458c07be5f3f3539b1420e2a51f8b4efe04a (diff)
downloadtor-df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d.tar.gz
tor-df57d1e0c0e3e19dc4963391ad7f80ead3ab4f0d.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
-rw-r--r--changes/longclaw_235923
-rw-r--r--src/or/config.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/longclaw_23592 b/changes/longclaw_23592
new file mode 100644
index 0000000000..91e2da8972
--- /dev/null
+++ b/changes/longclaw_23592
@@ -0,0 +1,3 @@
+ o Directory authority changes:
+ - The directory authority "Longclaw" has changed its IP address.
+ Closes ticket 23592.
diff --git a/src/or/config.c b/src/or/config.c
index a98d18355f..f84e69e257 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1021,7 +1021,7 @@ static const char *default_authorities[] = {
"154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
"longclaw orport=443 "
"v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
- "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+ "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
NULL
};