[glib/glib-2-60: 3/3] Merge branch 'backport-865-happier-eyeballs-glib-2-60' into 'glib-2-60'

[Philip Withnall <pwithnall src gnome org>]

commit dbd8193a871427d49b5c91b0fc3a646f23f098b3
Merge: 39cbb84e3 24c2760c8
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Jun 5 09:45:40 2019 +0000

    Merge branch 'backport-865-happier-eyeballs-glib-2-60' into 'glib-2-60'
    
    Backport !865 'gnetworkaddress: fix "happy eyeballs" logic' to glib-2-60
    
    See merge request GNOME/glib!894

 gio/gnetworkaddress.c       |  7 +------
 gio/tests/network-address.c | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 6 deletions(-)
---