[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.4' into maint-0.2.5

[nickm at torproject.org]

commit b9ef21cf565cab46571f965fc2d3f368c7e7a1da
Merge: 6b37512 e4a4224
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:17:59 2017 -0500

    Merge branch 'maint-0.2.4' into maint-0.2.5

 changes/bifroest | 3 +++
 src/or/config.c  | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --cc src/or/config.c
index 3c7e6e4,eae7296..c60dd11
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -856,21 -794,21 +856,21 @@@ add_default_trusted_dir_authorities(dir
        "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
      "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
        "194.109.206.212:80 7EA6 EAD6 FD83 083C 538F 4403 8BBF A077 587D D755",
-     "Tonga orport=443 bridge 82.94.251.203:80 "
-       "4A0C CD2D DC79 9508 3D73 F5D6 6710 0C8A 5831 F16D",
 -    "Bifroest orport=443 bridge no-v2 "
++    "Bifroest orport=443 bridge "
+       "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
 -    "gabelmoo orport=443 no-v2 "
 +    "gabelmoo orport=443 "
        "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
        "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
 -    "dannenberg orport=443 no-v2 "
 +    "dannenberg orport=443 "
        "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "
        "193.23.244.244:80 7BE6 83E6 5D48 1413 21C5 ED92 F075 C553 64AC 7123",
 -    "maatuska orport=80 no-v2 "
 +    "maatuska orport=80 "
        "v3ident=49015F787433103580E3B66A1707A00E60F2D15B "
        "171.25.193.9:443 BD6A 8292 55CB 08E6 6FBE 7D37 4836 3586 E46B 3810",
 -    "Faravahar orport=443 no-v2 "
 +    "Faravahar orport=443 "
        "v3ident=EFCBE720AB3A82B99F9E953CD5BF50F7EEFC7B97 "
        "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC",
 -    "longclaw orport=443 no-v2 "
 +    "longclaw orport=443 "
        "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 "
        "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145",
      NULL