aboutsummaryrefslogtreecommitdiff
path: root/src/app
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-07-12 14:32:16 -0400
committerNick Mathewson <nickm@torproject.org>2018-07-12 14:32:16 -0400
commitb6c50c625941f16339b8680ca45e6f3dba2a9a97 (patch)
treefc1cbace63d1add7749b37e665e7accb2e8920b8 /src/app
parent0317eb143ec6869e5a27c1ffc6d3d89be4c35c32 (diff)
parente0f33c1d3e7b87fcea26b8ba2ffb9d292449d9d8 (diff)
downloadtor-b6c50c625941f16339b8680ca45e6f3dba2a9a97.tar.gz
tor-b6c50c625941f16339b8680ca45e6f3dba2a9a97.zip
Merge branch 'maint-0.3.4'
Diffstat (limited to 'src/app')
-rw-r--r--src/app/config/auth_dirs.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/config/auth_dirs.inc b/src/app/config/auth_dirs.inc
index e0937541ea..08a919b053 100644
--- a/src/app/config/auth_dirs.inc
+++ b/src/app/config/auth_dirs.inc
@@ -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 "