From 854d1752453d742db9c759f2ae4c3253dd0143e7 Mon Sep 17 00:00:00 2001 From: clowwindy Date: Thu, 10 Apr 2014 13:55:43 +0800 Subject: [PATCH] fix a typo in help --- CHANGES | 3 +++ README.md | 2 +- setup.py | 2 +- shadowsocks/utils.py | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES b/CHANGES index 6aef45b..805de18 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,6 @@ +1.3.6 2014-04-10 +- Fix a typo in help + 1.3.5 2014-04-07 - Add help - Change default local binding address into 127.0.0.1 diff --git a/README.md b/README.md index 4408b8c..c2ca140 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ shadowsocks =========== -Current version: 1.3.5 [![Build Status](https://travis-ci.org/clowwindy/shadowsocks.png?branch=master)](https://travis-ci.org/clowwindy/shadowsocks) +Current version: 1.3.6 [![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 1fdf95c..f1ef2c5 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ with open('README.rst') as f: setup( name = "shadowsocks", - version = "1.3.5", + version = "1.3.6", license = 'MIT', description = "a lightweight tunnel proxy", author = 'clowwindy', diff --git a/shadowsocks/utils.py b/shadowsocks/utils.py index 4ad6356..7883a45 100644 --- a/shadowsocks/utils.py +++ b/shadowsocks/utils.py @@ -51,7 +51,7 @@ optional arguments: -s SERVER_ADDR server address -p SERVER_PORT server port -b LOCAL_ADDR local binding address, default is 127.0.0.1 - -s LOCAL_PORT local port + -l LOCAL_PORT local port -k PASSWORD password -s METHOD encryption method, for example, aes-256-cfb -c CONFIG path to config file