[tor-commits] [oonib/master] pass tor_binary config to txtorcon (#79)

[art at torproject.org]

commit 0b6477c7af96663d2b0d853db66e413cdd599b30
Author: Joe Landers <joe at joelanders.net>
Date:   Mon May 23 17:51:52 2016 +0200

    pass tor_binary config to txtorcon (#79)
---
 oonib/onion.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/oonib/onion.py b/oonib/onion.py
index 8abefe5..0a7a155 100644
--- a/oonib/onion.py
+++ b/oonib/onion.py
@@ -106,13 +106,15 @@ def get_global_tor(reactor):
 
     try:
         if _global_tor_config is None:
-            _global_tor_config = config = _configTor()
+            _global_tor_config = _configTor()
 
             # start Tor launching
             def updates(prog, tag, summary):
                 print("%d%%: %s" % (prog, summary))
-            yield launch_tor(config, reactor, progress_updates=updates)
-            yield config.post_bootstrap
+            yield launch_tor(_global_tor_config, reactor,
+                    progress_updates=updates,
+                    tor_binary=config.main.tor_binary)
+            yield _global_tor_config.post_bootstrap
 
         defer.returnValue(_global_tor_config)
     finally: