Merge 5fad90d81e into b8cb1a3e97

2013-04-10 02:02:15 -07:00 · 2013-04-10 02:02:15 -07:00 · 7f8287bfd9
commit 7f8287bfd9
parent b8cb1a3e97 5fad90d81e
1 changed files with 4 additions and 4 deletions
--- a/config.json
+++ b/config.json
@ -1,7 +1,7 @@
 {
-    "server":"localhost",
+    "server":"p2.5bird.com",
-    "server_port":8388,
+    "server_port":13412,
-    "local_port":1080,
+    "local_port":8080,
-    "password":"barfoo!",
+    "password":"zhangminz",
    "timeout":600
 }