change default timeout

12 years ago · f04c45a43d
4 changed files with 5 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@ shadowsocks
 ===========

 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png)](https://travis-ci.org/clowwindy/shadowsocks)  
-Current version: 0.9.1
+Current version: 0.9.2

 shadowsocks is a lightweight tunnel proxy which can help you get through firewalls

--- a/config.json
+++ b/config.json
@ -3,5 +3,5 @@
    "server_port":8388,
    "local_port":1080,
    "password":"barfoo!",
-    "timeout":60
+    "timeout":600
 }
--- a/local.py
+++ b/local.py
@ -148,7 +148,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):

 if __name__ == '__main__':
    os.chdir(os.path.dirname(__file__) or '.')
-    print 'shadowsocks v0.9.1'
+    print 'shadowsocks v0.9.2'

    with open('config.json', 'rb') as f:
        config = json.load(f)
--- a/server.py
+++ b/server.py
@ -125,7 +125,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
 if __name__ == '__main__':
    os.chdir(os.path.dirname(__file__) or '.')

-    print 'shadowsocks v0.9.1'
+    print 'shadowsocks v0.9.2'

    with open('config.json', 'rb') as f:
        config = json.load(f)