Merge pull request #1137 from evoskuil/master

VS updates for socks, rem libsodium VS crypt32 dependency.