diff --git a/README.md b/README.md index 00672bd7..11e223e0 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,28 @@ It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks) created by [@clowwindy](https://github.com/clowwindy) maintained by [@madeye](https://github.com/madeye). -Current version: 1.2 [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) +Current version: 1.3 [![Build Status](https://travis-ci.org/madeye/shadowsocks-libev.png?branch=master)](https://travis-ci.org/madeye/shadowsocks-libev) + +Changelog +--------- + +shadowsocks 1.3 -- Thu, 16 May 2013 10:51:15 +0800 + + * Able to bind connections to specific interface + * Support more ciphers: aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb + +shadowsocks 1.2 -- Tue, 07 May 2013 14:10:33 +0800 + + * Close timeouted TCP connections + * Fix a high load issue + +shadowsocks 1.1 -- Wed, 10 Apr 2013 12:11:36 +0800 + + * Fix a IPV6 resolve issue + +shadowsocks 1.0 -- Sat, 06 Apr 2013 16:59:15 +0800 + + * Initial release Features -------- @@ -52,7 +73,8 @@ usage: options: - encrypt_method: table, rc4 + encrypt_method: table, rc4, aes-128-cfb, aes-192-cfb, aes-256-cfb, + bf-cfb, cast5-cfb, des-cfb pid_file: valid path to the pid file timeout: socket timeout in senconds config_file: json format config file diff --git a/debian/changelog b/debian/changelog index 595a5f18..d97e1c6b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ shadowsocks (1.3-1) unstable; urgency=low * Able to bind connections to specific interface + * Support more ciphers: aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb -- Max Lv Thu, 16 May 2013 10:51:15 +0800 diff --git a/src/utils.c b/src/utils.c index 1f621b91..fce357d2 100644 --- a/src/utils.c +++ b/src/utils.c @@ -70,7 +70,8 @@ void usage() { printf(" [-m encrypt_method] [-f pid_file] [-t timeout] [-c config_file]\n"); printf("\n"); printf(" options:\n\n"); - printf(" encrypt_method: table, rc4\n"); + printf(" encrypt_method: table, rc4, aes-128-cfb, aes-192-cfb, aes-256-cfb,\n"); + printf(" bf-cfb, cast5-cfb, des-cfb\n"); printf(" pid_file: valid path to the pid file\n"); printf(" timeout: socket timeout in senconds\n"); printf(" config_file: json format config file\n");