From f04c45a43d8ede15e68fd3e6aa1af7157a3949f6 Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Mon, 7 Jan 2013 13:08:38 +0800
Subject: [PATCH] change default timeout

---
 README.md   | 2 +-
 config.json | 4 ++--
 local.py    | 2 +-
 server.py   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 9a758ed..3e356e4 100644
--- 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
 
diff --git a/config.json b/config.json
index 62a3a65..67c6b65 100644
--- a/config.json
+++ b/config.json
@@ -3,5 +3,5 @@
     "server_port":8388,
     "local_port":1080,
     "password":"barfoo!",
-    "timeout":60
-}
\ No newline at end of file
+    "timeout":600
+}
diff --git a/local.py b/local.py
index 09d7f73..6484874 100755
--- 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)
diff --git a/server.py b/server.py
index 580ff2f..62d0326 100755
--- 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)