Merge branch 'develop'

.travis.yml

@@ -1,9 +1,9 @@
 language: go
 install:
   - go get github.com/cyfdecyf/leakybuf
-  - mkdir -p $GOPATH/src/github.com/shadowsocks/shadowsocks-go/shadowsocks
-  - mv * $GOPATH/src/github.com/shadowsocks/shadowsocks-go
-  - pushd $GOPATH/src/github.com/shadowsocks/shadowsocks-go
+  - go get code.google.com/p/go.crypto/blowfish
+  - go get code.google.com/p/go.crypto/cast5
+  - pushd $TRAVIS_BUILD_DIR
   - go install ./cmd/shadowsocks-local
   - go install ./cmd/shadowsocks-server
   - popd

config.json

@@ -3,6 +3,5 @@
     "server_port":8388,
     "local_port":1080,
     "password":"barfoo!",
-    "method": null,
     "timeout":600
 }

script/test.sh

@@ -82,7 +82,7 @@ SERVER="shadowsocks-server"
 LOCAL="shadowsocks-local"
 test_server_local_pair
 
-if [ -n $SS_NODEJS ]; then
+if [[ -n $SS_NODEJS ]]; then
     pushd $SS_NODEJS
 
     SERVER="node server.js"

shadowsocks/encrypt.go

@@ -224,4 +224,6 @@ func (c *Cipher) Copy() *Cipher {
 		nc.dec = nil
 		return &nc
 	}
+	// should not reach here, keep it to make go 1.0.x compiler happy
+	return nil
 }