am 2a47fbf1: Merge "Fix win32 implicit declaration of function socket_network_client_timeout."

* commit '2a47fbf1c2a3d1a6b033d85ed15be9dc7e899406':
  Fix win32 implicit declaration of function socket_network_client_timeout.