Merge branch 'maint-0.2.5' into maint-0.2.6

diff --cc src/or/config.c
index 89b608781475928095f62e50ff8696cd1538d172,c60dd11c4de99e1dbd6c5a8a20c76e63a6ef123e..233940ec95002062b489c3fc0fd61bb4535cf83b
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -853,14 -852,12 +853,14 @@@ add_default_trusted_dir_authorities(dir
      "moria1 orport=9101 "
        "v3ident=D586D18309DED4CD6D57C18FDB97EFA96D330566 "
        "128.31.0.39:9131 9695 DFC3 5FFE B861 329B 9F1A B04C 4639 7020 CE31",
 -    "tor26 orport=443 v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
 +    "tor26 orport=443 "
 +      "v3ident=14C131DFC5C6F93646BE72FA1401C02A8DF2E8B4 "
        "86.59.21.38:80 847B 1F85 0344 D787 6491 A548 92F9 0493 4E4E B85D",
 -    "dizum orport=443 v3ident=E8A9C45EDE6D711294FADF8E7951F4DE6CA56B58 "
 +    "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 "
+       "37.218.247.217:80 1D8F 3A91 C37C 5D1C 4C19 B1AD 1D0C FBE8 BF72 D8E1",
      "gabelmoo orport=443 "
        "v3ident=ED03BB616EB2F60BEC80151114BB25CEF515B226 "
        "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",