Conform tor setup to the restrictions for incoming and outgoing connections;

don't start the tor service with --no-incoming if there is a system one.

minode/main.py

@@ -271,7 +271,7 @@ 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:
@@ -285,7 +285,7 @@ def main():
             logging.info('Failed to import tor module.', exc_info=True)
         else:
             if not tor.start_tor_service():
-                    logging.warning('Failed to start tor service.')
+                logging.warning('The tor service has not started.')
 
     if shared.ip_enabled and not shared.trusted_peer and not shared.tor:
         bootstrap_from_dns()

minode/tor.py

@@ -63,6 +63,8 @@ def start_tor_service():
                 init_msg_handler=logwrite)
         except OSError:
             if not attempt:
+                if not shared.listen_for_connections:
+                    return
                 try:
                     stem.version.get_system_tor_version()
                 except IOError:
@@ -75,6 +77,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()