commit 2b8f2505726e8b426fe75ea592bb3b5b588b220e Author: Nick Mathewson nickm@torproject.org Date: Tue May 14 14:36:54 2019 -0400

Bridge lines now contain fingerprints, and may contain extra pt material --- lib/chutney/TorNet.py | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 2640e0c..087cef9 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -643,17 +643,23 @@ class LocalNodeBuilder(NodeBuilder): if self._env['pt_bridge']: port = self._env['ptport'] transport = self._env['pt_transport'] + extra = self._env['pt_extra'] else: port = self._env['orport'] transport = "" + extra = ""

- bridgelines = "Bridge %s %s:%s\n" % (transport, + bridgelines = "Bridge %s %s:%s %s %s\n" % (transport, self._env['ip'], - port) + port, + self._env['fingerprint'], + extra) if self._env['ipv6_addr'] is not None: - bridgelines += "Bridge %s %s:%s\n" % (transport, - self._env['ipv6_addr'], - port) + bridgelines += "Bridge %s %s:%s %s %s\n" % (transport, + self._env['ipv6_addr'], + port, + self._env['fingerprint'], + extra) return bridgelines

@@ -879,6 +885,7 @@ DEFAULTS = { 'bridge': False, 'pt_bridge': False, 'pt_transport' : "", + 'pt_extra' : "", 'hs': False, 'hs_directory': 'hidden_service', 'hs-hostname': None,