[glib: 7/7] Merge branch 'wip/pwithnall/1954-dbus-keyring-handling' into 'master'

[Simon McVittie <smcv src gnome org>]

commit 3b3026b76358736548b431d4bbbc0c4b35a623fe
Merge: da84e9eb2 662771464
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Tue May 5 16:07:28 2020 +0000

    Merge branch 'wip/pwithnall/1954-dbus-keyring-handling' into 'master'
    
    Fix TOCTTOU races in D-Bus SHA-1 auth mechanism
    
    Closes #1954
    
    See merge request GNOME/glib!1477

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