am 5199176d: am b6bbcb1f: am 564b0462: Merge "Fix win32 undefined reference to `_socket_network_client_timeout\'."

* commit '5199176d19e09ca22a3519144ab275ec9e24b99d':
  Fix win32 undefined reference to `_socket_network_client_timeout'.