Commit 8cc147aa authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.2.5' into maint-0.2.8

parents 9a1b3854 15a69946

changes/ticket23910

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  o Directory authority changes:

    - Add bastet as a ninth directory authority to the default list. Closes

      ticket 23910.

src/or/config.c

+3 −0
Original line number Diff line number Diff line
@@ -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

};