Merge branch 'maint-0.2.5' into release-0.2.5

2017-10-23 09:03:58 -04:00 · 2017-10-23 09:03:58 -04:00 · 5e1bad3259
parent 533ae56fcf 15a699462d
commit 5e1bad3259
2 changed files with 6 additions and 0 deletions
--- 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.
--- a/src/or/config.c
+++ b/src/or/config.c
@ -873,6 +873,9 @@ add_default_trusted_dir_authorities(dirinfo_type_t type)
    "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
  };
  for (i=0; authorities[i]; i++) {