diff --git a/src/Connection/ConnectionServer.py b/src/Connection/ConnectionServer.py
index f657f000..49130c2f 100644
--- a/src/Connection/ConnectionServer.py
+++ b/src/Connection/ConnectionServer.py
@@ -64,7 +64,7 @@ class ConnectionServer(object):
         if check_connections:
             self.thread_checker = gevent.spawn(self.checkConnections)
         CryptConnection.manager.loadCerts()
-        if config.tor != "disabled":
+        if config.tor != "disable":
             self.tor_manager.start()
         if not self.port:
             self.log.info("No port found, not binding")
@@ -89,6 +89,7 @@ class ConnectionServer(object):
             self.log.info("StreamServer listen error: %s" % err)
 
     def stop(self):
+        self.log.debug("Stopping")
         self.running = False
         if self.stream_server:
             self.stream_server.stop()
diff --git a/src/Tor/TorManager.py b/src/Tor/TorManager.py
index 60fc4395..b0001529 100644
--- a/src/Tor/TorManager.py
+++ b/src/Tor/TorManager.py
@@ -59,6 +59,7 @@ class TorManager(object):
         self.proxy_port = int(self.proxy_port)
 
     def start(self):
+        self.log.debug("Starting (Tor: %s)" % config.tor)
         self.starting = True
         try:
             if not self.connect():