Bump to 1.2.0.

shadowsocks · Jan 19, 2017 · d7780ed · d7780ed
1 parent 964fa27
commit d7780ed
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,13 @@
+1.2.0 (2017-01-20)
+    * Support UDP reley on server side, and OTA
+    * Support "aes-[128/192/256]-ctr" encryption method (Thanks for @slurin)
+    * Support "chacha20-ietf" encryption method
+    * Improve performance of "chacha20" encryption method
+    * Corrently close connection if handshake failed
+
+1.1.5 (2016-05-04)
+    * Support OTA (Thanks for @ayanamist for implementing this feature)
+
 1.1.4 (2015-05-10)
     * Support "chacha20" encryption method, thanks to @defia
     * Support "salsa20" encryption method, thanks to @genzj

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # shadowsocks-go
 
-Current version: 1.1.5 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 1.2.0 [![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).
 

diff --git a/shadowsocks/util.go b/shadowsocks/util.go
@@ -1,16 +1,16 @@
 package shadowsocks
 
 import (
-	"errors"
-	"fmt"
-	"os"
 	"crypto/hmac"
 	"crypto/sha1"
 	"encoding/binary"
+	"errors"
+	"fmt"
+	"os"
 )
 
 func PrintVersion() {
-	const version = "1.1.5"
+	const version = "1.2.0"
 	fmt.Println("shadowsocks-go version", version)
 }
 
@@ -57,4 +57,4 @@ func (flag *ClosedFlag) SetClosed() {
 
 func (flag *ClosedFlag) IsClosed() bool {
 	return flag.flag
-}
+}