[glib: 4/4] Merge branch 'w32-testsuite-fixes-socket' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit b72b4e2d24b1f3b29332b1c3f58e68463f087d93
Merge: 953088343 c00724d5c
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Feb 18 12:54:45 2019 +0000

    Merge branch 'w32-testsuite-fixes-socket' into 'master'
    
    Socket fixes to W32 test suite
    
    See merge request GNOME/glib!666

 gio/tests/socket.c | 38 ++++++++++++++++++++++++++++++++++----
 1 file changed, 34 insertions(+), 4 deletions(-)
---