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
commitc958fda6e29265b12b987ee8445873c25629ae71 (patch)
treeddcaff6ba38811ee4058304611fc7a456cd155f1
parent132e2f69b1068b139d3c114fddd6efe58d6fc8f4 (diff)
parent9a1b385462556b36dc08265eb9d96958e9d2ed29 (diff)
downloadtor-c958fda6e29265b12b987ee8445873c25629ae71.tar.gz
tor-c958fda6e29265b12b987ee8445873c25629ae71.zip
Merge branch 'maint-0.2.8' into maint-0.2.9
-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 2e001ee5ab..e720cf2362 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -974,7 +974,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
};