[glib: 2/2] Merge branch 'wip/tingping/pkcs11' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit d207e19d32a3595570e8684fa6e1753f061c24c9
Merge: 0c40f3f6b b6d8efbeb
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu Oct 3 12:12:16 2019 +0000

    Merge branch 'wip/tingping/pkcs11' into 'master'
    
    gtlscertificate: Add pkcs11-uri property and constructor
    
    Closes #1809
    
    See merge request GNOME/glib!933

 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, 196 insertions(+), 4 deletions(-)
---