Bump version to 1.1.4

shadowsocks · May 10, 2015 · d4a6a12 · d4a6a12
1 parent 0cb0001
commit d4a6a12
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,2 @@
 *.deb
+script/http
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+1.1.4 (2015-05-10)
+    * Support "chacha20" encryption method, thanks to @defia
+    * Support "salsa20" encryption method, thanks to @genzj
+    * Fix go 1.4 canonical import paths, thanks to @ddatsh
+    * Exit if port not bindable, thanks to @thomasf
+    * More buffer reuse
+
 1.1.3 (2014-09-28)
     * Fix can't specify encryption method in config file
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 1.1.3 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 1.1.4 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
 
 shadowsocks-go is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
 
@@ -36,7 +36,7 @@ server          your server ip or hostname
 server_port     server port
 local_port      local socks5 proxy port
 method          encryption method, null by default (table), the following methods are supported:
-                    aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb, rc4-md5, rc4, table
+                    aes-128-cfb, aes-192-cfb, aes-256-cfb, bf-cfb, cast5-cfb, des-cfb, rc4-md5, chacha20, salsa20, rc4, table
 password        a password used to encrypt transfer
 timeout         server option, in seconds
 ```

diff --git a/shadowsocks/util.go b/shadowsocks/util.go
@@ -7,7 +7,7 @@ import (
 )
 
 func PrintVersion() {
-	const version = "1.1.3"
+	const version = "1.1.4"
 	fmt.Println("shadowsocks-go version", version)
 }