Merge remote-tracking branch 'origin/master' into release/4.8.1 · shadowsocksrr/shadowsocksr-csharp@07395da · GitHub

Commit

Merge remote-tracking branch 'origin/master' into release/4.8.1

Browse files

# Conflicts:
#	shadowsocks-csharp/Data/libsscrypto.dll.gz
#	shadowsocks-csharp/Data/libsscrypto64.dll.gz

Loading branch information

Akkariiin committed Oct 15, 2017

2 parents 90e3bb3 + 13a9472 commit 07395da