[glib/glib-2-60: 2/2] Merge branch 'wip/tingping/network-address-backport' into 'glib-2-60'

[Philip Withnall <pwithnall src gnome org>]

commit 57997abdc1706f5a10ce1a26c91c5ddfb9e388bc
Merge: 6729a82b0 1b77792ac
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu May 16 09:01:48 2019 +0000

    Merge branch 'wip/tingping/network-address-backport' into 'glib-2-60'
    
    Backport !823 "gnetworkaddress: Fix parallel enumerations interfering with eachother" to glib-2-60
    
    See merge request GNOME/glib!834

 gio/gnetworkaddress.c       | 234 +++++++++++++++++++++++++-------------------
 gio/tests/network-address.c |  63 +++++++++++-
 2 files changed, 198 insertions(+), 99 deletions(-)
---