summaryrefslogtreecommitdiff
path: root/onionshare/onionshare.py
diff options
context:
space:
mode:
Diffstat (limited to 'onionshare/onionshare.py')
-rw-r--r--onionshare/onionshare.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/onionshare/onionshare.py b/onionshare/onionshare.py
index 2e948c76..54f3b27e 100644
--- a/onionshare/onionshare.py
+++ b/onionshare/onionshare.py
@@ -17,7 +17,7 @@ GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
-import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, tempfile
+import os, sys, subprocess, time, argparse, inspect, shutil, socket, threading, urllib2, httplib, tempfile
import socks
from stem.control import Controller
@@ -208,6 +208,9 @@ class OnionShare(object):
except urllib2.HTTPError: # Tails error
sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope')))
sys.stdout.flush()
+ except httplib.BadStatusLine: # Tails (with bridge) error
+ sys.stdout.write('{0:s}\n'.format(strings._('wait_for_hs_nope')))
+ sys.stdout.flush()
except KeyboardInterrupt:
return False
return True