Merge branch 'master' into 3552.test_system-python-3

This commit is contained in:
Itamar Turner-Trauring
2020-12-17 09:42:34 -05:00
committed by GitHub
20 changed files with 561 additions and 250 deletions

View File

@ -270,7 +270,7 @@ def create_client_from_config(config, _client_factory=None, _introducer_factory=
i2p_provider = create_i2p_provider(reactor, config)
tor_provider = create_tor_provider(reactor, config)
handlers = node.create_connection_handlers(reactor, config, i2p_provider, tor_provider)
handlers = node.create_connection_handlers(config, i2p_provider, tor_provider)
default_connection_handlers, foolscap_connection_handlers = handlers
tub_options = node.create_tub_options(config)