Merge pull request #2681 from dibdot/shadowsocks-fix