[glib/glib-2-64: 7/7] Merge branch 'backport-1477-dbus-keyring-handling-glib-2-64' into 'glib-2-64'

[Simon McVittie <smcv src gnome org>]

commit d020a73b6610ce2829022387253b891e9d08b649
Merge: 95f6d3c80 f3b670025
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue May 5 18:46:28 2020 +0000

    Merge branch 'backport-1477-dbus-keyring-handling-glib-2-64' into 'glib-2-64'
    
    Backport !1477 D-Bus keyring handling fixes to glib-2-64
    
    See merge request GNOME/glib!1478

 gio/gdbusauthmechanismsha1.c  | 205 ++++++++++++++++++++++--------------------
 gio/tests/gdbus-server-auth.c |  14 ++-
 2 files changed, 118 insertions(+), 101 deletions(-)
---