Separate socket creation and connection to be able to cancel it

src/Connection/Connection.py

@@ -104,7 +104,8 @@ class Connection(object):
                 raise Exception("Can't connect to onion addresses, no Tor controller present")
             self.sock = self.server.tor_manager.createSocket(self.ip, self.port)
         else:
-            self.sock = socket.create_connection((self.ip, int(self.port)))
+            self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.sock.connect((self.ip, int(self.port)))
 
         # Implicit SSL
         if self.cert_pin:

src/Tor/TorManager.py

@@ -304,9 +304,7 @@ class TorManager(object):
         self.log.debug("Creating new Tor socket to %s:%s" % (onion, port))
         if config.tor == "always":  # Every socket is proxied by default, in this mode
             sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-            sock.connect((onion, int(port)))
         else:
             sock = socks.socksocket()
             sock.set_proxy(socks.SOCKS5, self.proxy_ip, self.proxy_port)
-            sock.connect((onion, int(port)))
         return sock