Quellcode durchsuchen

Merge branch 'maint-0.3.0' into maint-0.3.1

Nick Mathewson vor 7 Jahren
Ursprung
Commit
703ab95e9f
2 geänderte Dateien mit 5 neuen und 0 gelöschten Zeilen
  1. 4 0
      changes/bastet_v6
  2. 1 0
      src/or/config.c

+ 4 - 0
changes/bastet_v6

@@ -0,0 +1,4 @@
+  o Minor features (directory authority):
+    - Add an IPv6 address for the "bastet" directory authority.
+      Closes ticket 24394.
+

+ 1 - 0
src/or/config.c

@@ -1024,6 +1024,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
 };