[glib: 2/2] Merge branch 'mcatanzaro/pkcs11-deferral' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit bb501bb8be2f2284b25d2d875b2d936211c127a9
Merge: 5941bfa49 d58e5de9e
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Jan 31 12:19:15 2020 +0000

    Merge branch 'mcatanzaro/pkcs11-deferral' into 'master'
    
    Revert "gtlscertificate: Add support for PKCS #11 backed certificates"
    
    See merge request GNOME/glib!1347

 docs/reference/gio/gio-sections-common.txt |   1 -
 gio/gtlscertificate.c                      | 132 +----------------------------
 gio/gtlscertificate.h                      |   5 --
 gio/tests/gtesttlsbackend.c                |  25 +-----
 gio/tests/tls-certificate.c                |  37 --------
 5 files changed, 4 insertions(+), 196 deletions(-)
---