commit 3fd67d201061ca22c5fcdbc7bbaafb9897a888c5 Author: aagbsn aagbsn@extc.org Date: Wed Dec 5 16:56:49 2012 +0000

call launch_tor with the tor_binary from config

Otherwise, the default is supplied by txtorcon as /usr/sbin/tor --- ooni/runner.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/ooni/runner.py b/ooni/runner.py index bc9b874..2123a7d 100644 --- a/ooni/runner.py +++ b/ooni/runner.py @@ -516,6 +516,7 @@ def startTor(): log.debug("Setting SOCKS port as %s" % tor_config.SocksPort)

d = launch_tor(tor_config, reactor, + tor_binary=config.advanced.tor_binary, progress_updates=updates) d.addCallback(setup_complete) d.addErrback(setup_failed)