commit 5a45d4a31da2ce5c147c914da1429a74d3f24428 Author: Isis Lovecruft isis@torproject.org Date: Sun Apr 21 06:06:13 2013 +0000

Don't pass the tor_binary option to txtorcon if not set.

* txtorcon will handle finding the tor binary for us. --- oonib/runner.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/oonib/runner.py b/oonib/runner.py index db6d734..2e1e6e0 100644 --- a/oonib/runner.py +++ b/oonib/runner.py @@ -73,9 +73,12 @@ def startTor(): torconfig.Tor2webMode = 1 torconfig.CircuitBuildTimeout = 60 torconfig.save() - d = txtorcon.launch_tor(torconfig, reactor, - tor_binary=config.main.tor_binary, - progress_updates=updates) + if config.main.tor_binary is not None: + d = txtorcon.launch_tor(torconfig, reactor, + tor_binary=config.main.tor_binary, + progress_updates=updates) + else: + d = txtorcon.launch_tor(torconfig, reactor, progress_updates=updates) d.addCallback(setupCollector) d.addErrback(txSetupFailed)