Show a terminal message if bridge is enabled but one is not set. By design, there is no easy way for us to get Tor bridges automatically

work on tor blocking detection

.gitignore

@@ -40,3 +40,5 @@ src/data/*.log
 onionr-*.pkg.tar.gz
 pkg/
 spawnnodes.py
+
+static-data/tor-node-list.dat

scripts/unblock-tor.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+# Unblock Tor Exit nodes
+iptables -F Tor

src/netcontroller/torcontrol/addbridges.py

@@ -29,7 +29,7 @@ def add_bridges(torrc: str) -> str:
             # allow blank fingerprint purposefully
             fingerprint = config.get('tor.bridge_fingerprint', '')
             torrc += '\nUseBridges 1\nBridge %s %s\n' % (bridge, fingerprint)
-        else:
+        if not bridge:
             logger.error('Bridge was enabled but not specified in config, ' +
                          'this probably won\'t work', terminal=True)
 

static-data/download-tor-node-list.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$DIR"
+curl https://www.dan.me.uk/torlist/ > tor-node-list.dat
+sed -i 's|^#.*$||g' tor-node-list.dat