From 35c1c9cbcbee98791a5f67a906b331b2cb806aaa Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 20 Nov 2015 12:43:08 -0800 Subject: [PATCH] When looking for a Tor to use, prefer (in this order): Tor Browser, Tor Messenger, system Tor (fixes #215) --- onionshare/hs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onionshare/hs.py b/onionshare/hs.py index 8897ec0e..13c72ce3 100644 --- a/onionshare/hs.py +++ b/onionshare/hs.py @@ -63,7 +63,7 @@ class HS(object): # connect to the tor controlport self.c = None - ports = [9051, 9151] + ports = [9151, 9153, 9051] for port in ports: try: self.c = Controller.from_port(port=port) @@ -150,7 +150,7 @@ class HS(object): urllib2.urlopen('http://{0:s}'.format(onion_host)) else: tor_exists = False - ports = [9050, 9150] + ports = [9150, 9152, 9050] for port in ports: try: s = socks.socksocket()