Commit 98ee23ca authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.2

parents 6ad2c2b9 cd4795ca

changes/task26771

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

    - The "Bifroest" bridge authority has been retired; the new bridge

      authority is "Serge", and it is operated by George from the

      TorBSD project. Closes ticket 26771.

src/or/auth_dirs.inc

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ 
"dizum orport=443 "

  "v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "

  "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",

"Bifroest orport=443 bridge "

  "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",

"Serge orport=9001 bridge "

  "66.111.2.131:9030 BA44 A889 E64B 93FA A2B1 14E0 2C2A 279A 8555 C533",

"gabelmoo orport=443 "

  "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "

  "ipv6=[2001:638:a000:4140::ffff:189]:443 "