wytfy/v2ray-core @ 61d9b04ca52d98f4644e66d732ae9fc1d21cc391

Shelikhoo c542c043f3 Merge branch 'master' of github.com:v2ray/v2ray-core into domainsocket		7 gadi atpakaļ
..
client.go	053d03349a refactor	7 gadi atpakaļ
config.go	08dab81eb2 migrate int to int32	7 gadi atpakaļ
config.pb.go	074dfbb78c add network list to shadowsocks server	7 gadi atpakaļ
config.proto	074dfbb78c add network list to shadowsocks server	7 gadi atpakaļ
errors.generated.go	7f34cbdaff Add Generated Files	7 gadi atpakaļ
ota.go	c5bd23105e change uint32 to int32	7 gadi atpakaļ
ota_test.go	994aecd13c rename NewLocal to NewSize	7 gadi atpakaļ
protocol.go	9f198d7e3d fix lint errors	7 gadi atpakaļ
protocol_test.go	994aecd13c rename NewLocal to NewSize	7 gadi atpakaļ
server.go	074dfbb78c add network list to shadowsocks server	7 gadi atpakaļ
shadowsocks.go	d43a23aa96 move error generator to common	8 gadi atpakaļ