Merge branch 'release/0.6.2' into develop

dearplain · Mar 15, 2013 · 2cc9c99 · 2cc9c99
2 parents f75d779 + fc7ed47
commit 2cc9c99
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+0.6.1 (2013-03-15)
+    * Connect to multiple servers in the order specified in config
+    * More information in server error log to help error diagnosing
+
 0.6.1 (2013-03-04)
     * Small performance improvement
     * For windows: provide shadowsocks-tray.exe to hide shadowsocks-local.exe in

diff --git a/README.md b/README.md
@@ -1,11 +1,13 @@
 # shadowsocks-go
 
-Current version: 0.6.1 [![Build Status](https://travis-ci.org/shadowsocks/shadowsocks-go.png?branch=develop)](https://travis-ci.org/shadowsocks/shadowsocks-go)
+Current version: 0.6.2 [![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).
 
 The protocol is compatible with the origin shadowsocks (if both have been upgraded to the latest version).
 
+**Note `server_password` option syntax changed in 0.6.2, the client now connects to servers in the order specified in the config.**
+
 # Install
 
 Compiled client binaries are provided on [google code](http://code.google.com/p/shadowsocks-go/downloads/list). (Compiled with cgo disabled.)

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