aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-12-19 19:30:44 -0500
committerNick Mathewson <nickm@torproject.org>2012-12-19 19:30:44 -0500
commit2ce7c427d1e916b083c81781a17beb35dc5713e2 (patch)
tree66f7b53f5069a8192e966a3fabaf7153357500af
parent36cbc892d4a22a6284d4d1776824cedad89a555b (diff)
downloadchutney-2ce7c427d1e916b083c81781a17beb35dc5713e2.tar
chutney-2ce7c427d1e916b083c81781a17beb35dc5713e2.tar.gz
Make the "basic" and "mixed" networks work again. Need a better fix to make "bridges" work too
-rw-r--r--lib/chutney/TorNet.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 78728ed..dcaf7d8 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -326,7 +326,10 @@ class LocalNodeBuilder(NodeBuilder):
else:
# Directory authorities return AlternateDirAuthority with
# the 'hs' and 'v3ident' flags set.
- options = ("AlternateDirAuthority",)
+ # XXXX This next line is needed for 'bridges' but breaks
+ # 'basic'
+ #options = ("AlternateDirAuthority",)
+ options = ("DirServer",)
self._env['dirserver_flags'] += " hs v3ident=%s" % v3id
authlines = ""