From f58aa5f78e6f223d55d27560a4c034c247ca3ae4 Mon Sep 17 00:00:00 2001
From: HelloZeroNet <hello@noloop.me>
Date: Thu, 18 Jun 2015 02:53:01 +0200
Subject: [PATCH] Fix for importing libs before monkey patching breaks tor
 support

---
 src/main.py | 7 ++-----
 zeronet.py  | 8 +++-----
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main.py b/src/main.py
index fffab240..1f158669 100644
--- a/src/main.py
+++ b/src/main.py
@@ -3,15 +3,12 @@
 import os
 import sys
 import time
-import urllib2
-
+import logging
 
 # Third party modules
 import gevent
 from gevent import monkey
 
-# ZeroNet modules
-import logging
 
 update_after_shutdown = False  # If set True then update and restart zeronet after main loop ended
 
@@ -68,7 +65,7 @@ logging.debug("Config: %s" % config)
 # Socks Proxy monkey patch
 if config.proxy:
     from util import SocksProxy
-
+    import urllib2
     logging.info("Patching sockets to socks proxy: %s" % config.proxy)
     config.fileserver_ip = '127.0.0.1' # Do not accept connections anywhere but localhost
     SocksProxy.monkeyPath(*config.proxy.split(":"))
diff --git a/zeronet.py b/zeronet.py
index 3ed0efe2..a287d1f1 100644
--- a/zeronet.py
+++ b/zeronet.py
@@ -2,12 +2,7 @@
 
 # Included modules
 import os
-import gc
 import sys
-import traceback
-
-# ZeroNet Modules
-import update
 
 
 def main():
@@ -19,6 +14,8 @@ def main():
         import main
         main.start()
         if main.update_after_shutdown:  # Updater
+            import gc
+            import update
             # Try cleanup openssl
             try:
                 if "lib.opensslVerify" in sys.modules:
@@ -38,6 +35,7 @@ def main():
                 logger.removeHandler(handler)
 
     except (Exception, ):  # Prevent closing
+        import traceback
         traceback.print_exc()
         traceback.print_exc(file=open("log/error.log", "a"))