Merge branch 'mig5-525_catch_failure_to_obtain_service_id'

This commit is contained in:
Micah Lee 2018-01-13 19:14:33 -08:00
commit 627ea18f83
No known key found for this signature in database
GPG key ID: 403C2657CD994F73

View file

@ -413,7 +413,10 @@ class Onion(object):
auth_cookie = res.content()[2][2].split('=')[1].split(':')[1]
self.auth_string = 'HidServAuth {} {}'.format(onion_host, auth_cookie)
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):
"""