Commit b1c4ab0b authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.0

parents 2d849716 30b32292

changes/bastet_v6

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Minor features (directory authority):

    - Add an IPv6 address for the "bastet" directory authority.

      Closes ticket 24394.

src/or/config.c

+1 −0
Original line number Diff line number Diff line
@@ -1040,6 +1040,7 @@ static const char *default_authorities[] = { 
    "199.58.81.140:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",

  "bastet orport=443 "

    "v3ident=27102BC123E7AF1D4741AE047E160C91ADC76B21 "

    "ipv6=[2620:13:4000:6000::1000:118]:443 "

    "204.13.164.118:80 24E2 F139 121D 4394 C54B 5BCC 368B 3B41 1857 C413",

  NULL

};