From 68a77ddc70b7f0864bf85e2feb47bc73795f1e99 Mon Sep 17 00:00:00 2001
From: BreakWa11 <mmgac001@gmail.com>
Date: Sat, 19 Dec 2015 15:45:17 +0800
Subject: [PATCH] load 'user-config.json' first set default obfs plugin
 'tls1.0_session_auth_compatible'

---
 config.json          | 2 +-
 shadowsocks/shell.py | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config.json b/config.json
index eaaf50c..cbf648b 100644
--- a/config.json
+++ b/config.json
@@ -9,7 +9,7 @@
     "method": "aes-256-cfb",
     "protocol": "auth_sha1_compatible",
     "protocol_param": "",
-    "obfs": "http_simple_compatible",
+    "obfs": "tls1.0_session_auth_compatible",
     "obfs_param": "",
     "redirect": "",
     "dns_ipv6": false,
diff --git a/shadowsocks/shell.py b/shadowsocks/shell.py
index 2d636bf..342b8da 100644
--- a/shadowsocks/shell.py
+++ b/shadowsocks/shell.py
@@ -62,8 +62,14 @@ def print_shadowsocks():
         pass
     print('Shadowsocks %s' % version)
 
-
 def find_config():
+    config_path = 'user-config.json'
+    if os.path.exists(config_path):
+        return config_path
+    config_path = os.path.join(os.path.dirname(__file__), '../', 'user-config.json')
+    if os.path.exists(config_path):
+        return config_path
+
     config_path = 'config.json'
     if os.path.exists(config_path):
         return config_path