[glib: 2/2] Merge branch 'wip/2164-dbus-sha1-timeout' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit aea8c91837ecb6d96a4ea69dc3cfcef63f1412a5
Merge: f010a8c98 92183fb70
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Sep 10 11:13:52 2020 +0000

    Merge branch 'wip/2164-dbus-sha1-timeout' into 'master'
    
    gdbusauthmechanismsha1: Use the same timeouts as libdbus
    
    Closes #2164
    
    See merge request GNOME/glib!1641

 gio/gdbusauthmechanismsha1.c | 53 +++++++++++++++++++++++++++++++++-----------
 1 file changed, 40 insertions(+), 13 deletions(-)
---