Conform tor setup to the restrictions for incoming and outgoing connections

minode/main.py

@@ -267,21 +267,21 @@ def main():
                 'Error while creating data directory in: %s',
                 shared.data_directory, exc_info=True)
 
-    if shared.socks_proxy:
+    if shared.socks_proxy and shared.send_outgoing_connections:
         try:
             socks.PROXY_TYPES[shared.socks_proxy.scheme.upper()]
         except KeyError:
             logging.error('Unsupported proxy schema!')
             return
 
-        if shared.tor:
-            try:
-                from . import tor
-            except ImportError:
-                logging.info('Failed to import tor module.', exc_info=True)
-            else:
-                if not tor.start_tor_service():
-                    logging.warning('Failed to start tor service.')
+    if shared.tor:
+        try:
+            from . import tor
+        except ImportError:
+            logging.info('Failed to import tor module.', exc_info=True)
+        else:
+            if not tor.start_tor_service():
+                logging.warning('Failed to start tor service.')
 
     if shared.ip_enabled and not shared.trusted_peer and not shared.tor:
         bootstrap_from_dns()

minode/tor.py

@@ -75,6 +75,9 @@ def start_tor_service():
         logging.debug('Failed to start tor.')
         return
 
+    if not shared.listen_for_connections:
+        return True
+
     try:
         controller = stem.control.Controller.from_socket_file(control_socket)
         controller.authenticate()