[glib/glib-2-64: 5/5] Merge branch 'backport-various-to-glib-2-64' into 'glib-2-64'

[Sebastian Dröge <sdroege src gnome org>]

commit 68e18c6ec8e224a0c3eef93a2b0f1b12d71341f7
Merge: 255a5be57 7f697640f
Author: Sebastian Dröge <slomo coaxion net>
Date:   Mon Mar 9 21:56:37 2020 +0000

    Merge branch 'backport-various-to-glib-2-64' into 'glib-2-64'
    
    Backport various patches from master to glib-2-64
    
    See merge request GNOME/glib!1407

 gio/gcontenttype.c                    |  2 ++
 gio/gdummytlsbackend.c                |  6 ++++-
 gio/tests/memory-monitor-dbus.py.in   |  6 +++++
 gio/tests/memory-monitor-portal.py.in |  6 +++++
 gio/tests/meson.build                 | 48 +++++++++++++++++------------------
 5 files changed, 43 insertions(+), 25 deletions(-)
---