am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to...
am 6dfb039b: am 4a343436: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."
* commit '6dfb039b':
Fix win32 undefined reference to `_socket_network_client_timeout'.