[Pkg-privacy-commits] [onionshare] 27/53: When looking for a Tor to use, prefer (in this order): Tor Browser, Tor Messenger, system Tor (fixes #215)

[Ulrike Uhlig]

This is an automated email from the git hooks/post-receive script.

u-guest pushed a commit to branch debian
in repository onionshare.

commit 35c1c9cbcbee98791a5f67a906b331b2cb806aaa
Author: Micah Lee <micah at micahflee.com>
Date:   Fri Nov 20 12:43:08 2015 -0800

    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 8897ec0..13c72ce 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()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/onionshare.git