From 4da5ddf2c942e0896cb420f8a28005d7bf767c42 Mon Sep 17 00:00:00 2001 From: Miguel Jacq Date: Sun, 14 Jan 2018 18:45:10 +1100 Subject: [PATCH] Resolve conflict with upstream's onion.py --- onionshare/onion.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/onionshare/onion.py b/onionshare/onion.py index 3e30761a..cf761bb9 100644 --- a/onionshare/onion.py +++ b/onionshare/onion.py @@ -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): """