Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-10-01 01:35:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fred-a-kemp-feature/tor-control-port-from-env'

Browse Source
This commit is contained in:
Micah Lee 2016-09-27 14:09:39 -07:00
commit d8b0a4e152
No known key found for this signature in database
GPG Key ID: 403C2657CD994F73
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
onionshare/onion.py
View File

@ -57,7 +57,11 @@ class Onion(object):
# connect to the tor controlport
found_tor = False
self.c = None
ports = [9151, 9153, 9051]
env_port = os.environ.get('TOR_CONTROL_PORT')
if env_port:
ports = [int(env_port)]
else:
ports = [9151, 9153, 9051]
for port in ports:
try:
self.c = Controller.from_port(port=port)