Merge pull request #4689 from gilles-peskine-arm/winsock-fd-range-2.16

Backport 2.16: Fix net_sockets regression on Windows