aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-23 08:58:28 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-23 08:58:28 -0400
commit9a1b385462556b36dc08265eb9d96958e9d2ed29 (patch)
tree65731bd6e7451c908f1733e85c77eec504ae2fb8
parent6f87a85897ca82fac9fc132e0f0cf41eacab20d4 (diff)
parent5d219ecf98ff8b6a47fcb5fac5c511cd0b20bc86 (diff)
downloadtor-9a1b385462556b36dc08265eb9d96958e9d2ed29.tar.gz
tor-9a1b385462556b36dc08265eb9d96958e9d2ed29.zip
Merge branch 'maint-0.2.5' into maint-0.2.8
-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 7594c8989a..b93dfef927 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -928,7 +928,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
};