tor

commit 8cc147aa834b076233c5448992e145b908123908
parent 9a1b385462556b36dc08265eb9d96958e9d2ed29
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 23 Oct 2017 09:04:56 -0400

Merge branch 'maint-0.2.5' into maint-0.2.8

Diffstat:
A
changes/ticket23910
 | 
3
+++
M
src/or/config.c
 | 
3
+++

2 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/changes/ticket23910 b/changes/ticket23910
@@ -0,0 +1,3 @@
+  o Directory authority changes:
+    - Add bastet as a ninth directory authority to the default list. Closes
+      ticket 23910.
diff --git a/src/or/config.c b/src/or/config.c
@@ -929,6 +929,9 @@ static const char *default_authorities[] = {
   "longclaw orport=443 "
     "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
     "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
+  "bastet orport=443 "
+    "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "
+    "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",
   NULL
 };