Git-Mirrors/onionshare
1
0
Fork 0
mirror of https://github.com/onionshare/onionshare.git synced 2024-12-29 01:06:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Resolve conflict with upstream's onion.py

Browse Source
This commit is contained in:
Miguel Jacq 2018-01-14 18:45:10 +11:00
parent 9aef3cdbb3
commit 4da5ddf2c9
No known key found for this signature in database
GPG Key ID: 5418373DFF79BA19
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
onionshare/onion.py
View File

@ -445,7 +445,10 @@ class Onion(object):
self.auth_string = 'HidServAuth {} {}'.format(onion_host, auth_cookie)
self.settings.save()
return onion_host
if onion_host is not None:
return onion_host
else:
raise TorErrorProtocolError(strings._('error_tor_protocol_error'))
def cleanup(self, stop_tor=True):
"""