diff --git a/src/Config.py b/src/Config.py index c0a4c099..a3e825a3 100644 --- a/src/Config.py +++ b/src/Config.py @@ -9,7 +9,7 @@ class Config(object): def __init__(self, argv): self.version = "0.5.1" - self.rev = 1786 + self.rev = 1791 self.argv = argv self.action = None self.config_file = "zeronet.conf" diff --git a/src/Connection/ConnectionServer.py b/src/Connection/ConnectionServer.py index 9d5d859c..c55b125f 100644 --- a/src/Connection/ConnectionServer.py +++ b/src/Connection/ConnectionServer.py @@ -55,7 +55,7 @@ class ConnectionServer: if port: # Listen server on a port self.pool = Pool(1000) # do not accept more than 1000 connections self.stream_server = StreamServer( - (ip.replace("*", ""), port), self.handleIncomingConnection, spawn=self.pool, backlog=500 + (ip.replace("*", "0.0.0.0"), port), self.handleIncomingConnection, spawn=self.pool, backlog=500 ) if request_handler: self.handleRequest = request_handler diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py index b01ad794..4d122f48 100644 --- a/src/Tor/TorManager.py +++ b/src/Tor/TorManager.py @@ -14,7 +14,10 @@ from Config import config from Crypt import CryptRsa from Site import SiteManager from lib.PySocks import socks -from gevent.coros import RLock +try: + from gevent.coros import RLock +except: + from gevent.lock import RLock from util import helper from Debug import Debug