From 9d3e2d717753ba9489fcd553cd444449fffb13ac Mon Sep 17 00:00:00 2001 From: clowwindy Date: Fri, 18 Apr 2014 18:54:31 +0800 Subject: [PATCH] update help --- CHANGES | 3 +++ README.md | 2 +- setup.py | 2 +- shadowsocks/utils.py | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index 805de18..15fbdbd 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1.3.7 2014-04-10 +- Fix a typo in help + 1.3.6 2014-04-10 - Fix a typo in help diff --git a/README.md b/README.md index c2ca140..1fed484 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ shadowsocks =========== -Current version: 1.3.6 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png?branch=master)](https://travis-ci.org/clowwindy/shadowsocks) +Current version: 1.3.7 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png?branch=master)](https://travis-ci.org/clowwindy/shadowsocks) shadowsocks is a lightweight tunnel proxy which can help you get through firewalls. diff --git a/setup.py b/setup.py index f1ef2c5..86d7a0c 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open('README.rst') as f: setup( name = "shadowsocks", - version = "1.3.6", + version = "1.3.7", license = 'MIT', description = "a lightweight tunnel proxy", author = 'clowwindy', diff --git a/shadowsocks/utils.py b/shadowsocks/utils.py index 7883a45..0237444 100644 --- a/shadowsocks/utils.py +++ b/shadowsocks/utils.py @@ -53,7 +53,7 @@ optional arguments: -b LOCAL_ADDR local binding address, default is 127.0.0.1 -l LOCAL_PORT local port -k PASSWORD password - -s METHOD encryption method, for example, aes-256-cfb + -m METHOD encryption method, for example, aes-256-cfb -c CONFIG path to config file ''' @@ -65,6 +65,6 @@ optional arguments: -s SERVER_ADDR server address -p SERVER_PORT server port -k PASSWORD password - -s METHOD encryption method, for example, aes-256-cfb + -m METHOD encryption method, for example, aes-256-cfb -c CONFIG path to config file ''' \ No newline at end of file