Merge ceceb7749e into 2f0222aa00

2013-07-21 07:58:05 -07:00 · 2013-07-21 07:58:05 -07:00 · 750e00c7e5
commit 750e00c7e5
parent 2f0222aa00 ceceb7749e
1 changed files with 2 additions and 0 deletions
--- a/shadowsocks/local.py
+++ b/shadowsocks/local.py
@ -178,6 +178,8 @@ def main():
        logging.info('loading config from %s' % config_path)
        with open(config_path, 'rb') as f:
            config = json.load(f)
+    else:
+        config = {}
    optlist, args = getopt.getopt(sys.argv[1:], 's:b:p:k:l:m:c:6')
    for key, value in optlist:
        if key == '-p':