[glib: 3/3] Merge branch 'wip/tingping/socket-client-slow-fix' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 0d63ee09087d8fc7075c4827b15cd5a61b1f2c68
Merge: cdcb6c2cf f0fcb68da
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Feb 27 14:35:53 2019 +0000

    Merge branch 'wip/tingping/socket-client-slow-fix' into 'master'
    
    gsocketclient: Fix critical on cancellation
    
    Closes #1693 and #1653
    
    See merge request GNOME/glib!688

 gio/gsocketclient.c            | 35 ++++++++++++++++++------
 gio/tests/gsocketclient-slow.c | 61 ++++++++++++++++++++++++++++++++++++++++--
 gio/tests/meson.build          |  1 -
 3 files changed, 86 insertions(+), 11 deletions(-)
---