Merge branch 'manyuser' of git@breakwa11:breakwa11/shadowsocks.git into manyuser

shadowsocks/crypto/util.py

@@ -87,8 +87,8 @@ def find_library(possible_lib_names, search_symbol, library_name):
             else:
                 logging.warn('can\'t find symbol %s in %s', search_symbol,
                              path)
-        except Exception:
-            pass
+        except ValueError as e:
+            logging.error(e)
     return None
 
 

shadowsocks/tcprelay.py

@@ -717,8 +717,8 @@ class TCPRelay(object):
         self._closed = False
         self._eventloop = None
         self._fd_to_handlers = {}
-        self.server_transfer_ul = 0L
-        self.server_transfer_dl = 0L
+        self.server_transfer_ul = 0
+        self.server_transfer_dl = 0
 
         self._timeout = config['timeout']
         self._timeouts = []  # a list for all the handlers

shadowsocks/udprelay.py

@@ -873,8 +873,8 @@ class UDPRelay(object):
         self._dns_cache = lru_cache.LRUCache(timeout=300)
         self._eventloop = None
         self._closed = False
-        self.server_transfer_ul = 0L
-        self.server_transfer_dl = 0L
+        self.server_transfer_ul = 0
+        self.server_transfer_dl = 0
 
         self._sockets = set()
         self._fd_to_handlers = {}