mirror of
https://github.com/onionshare/onionshare.git
synced 2024-10-01 01:35:40 -04:00
When looking for a Tor to use, prefer (in this order): Tor Browser, Tor Messenger, system Tor (fixes #215)
This commit is contained in:
parent
52205be7fe
commit
35c1c9cbcb
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user