[tor-commits] [tor/master] Merge branch 'maint-0.2.7' into maint-0.2.8

[nickm@xxxxxxxxxxxxxx]

commit d3a975ea05bf8d850602a3ad8054402a679c5dcf
Merge: 0ba0531 f60da19
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Aug 24 10:02:52 2016 -0400

    Merge branch 'maint-0.2.7' into maint-0.2.8

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

diff --cc src/or/config.c
index 908f098,3094a1d..4b065a0
--- a/src/or/config.c
+++ b/src/or/config.c
@@@ -910,11 -869,10 +910,11 @@@ static const char *default_authorities[
    "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 "
 +    "ipv6=[2001:638:a000:4140::ffff:189]:443 "
      "131.188.40.189:80 F204 4413 DAC2 E02E 3D6B CF47 35A1 9BCA 1DE9 7281",
    "dannenberg orport=443 "
      "v3ident=0232AF901C31A04EE9848595AF9BB7620D4C5B2E "



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits