aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-08-24 10:03:19 -0400
committerNick Mathewson <nickm@torproject.org>2016-08-24 10:03:19 -0400
commit297635f806ec4244c4e6e6f093f87d647061d42a (patch)
treef4ec40f649fe47bcf37daae52df5ddc29c9d65d3 /src
parent8feb301413cc0f23b37dedbac0c57de25b88f519 (diff)
parentd3a975ea05bf8d850602a3ad8054402a679c5dcf (diff)
downloadtor-297635f806ec4244c4e6e6f093f87d647061d42a.tar.gz
tor-297635f806ec4244c4e6e6f093f87d647061d42a.zip
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 6fb361416b..1b6467695e 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -950,8 +950,8 @@ 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 "