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