SIGN IN SIGN UP

Merge with 3.2: use ws2_32.lib rather than wsock32.lib on windows.

K
Kristján Valur Jónsson committed
c014df7edf9d2358f80b783f4556a117a41924c0