[glib: 4/4] Merge branch 'default-tls-database' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit d3656705fa0b9a5794b8c00f93d5668347f372af
Merge: b79bafccf 27fca3474
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon Sep 3 13:22:39 2018 +0000

    Merge branch 'default-tls-database' into 'master'
    
    gtlsbackend: add support for setting the default TLS database
    
    Closes glib-networking#35
    
    See merge request GNOME/glib!273

 docs/reference/gio/gio-sections.txt |   1 +
 gio/gtlsbackend.c                   |  43 ++++++++++-
 gio/gtlsbackend.h                   |   3 +
 gio/gtlsdatabase.c                  |   3 +
 gio/tests/.gitignore                |   1 +
 gio/tests/Makefile.am               |   2 +
 gio/tests/gtesttlsbackend.c         | 146 ++++++++++++++++++++++++++++++++++--
 gio/tests/meson.build               |   1 +
 gio/tests/tls-database.c            |  75 ++++++++++++++++++
 glib/gversionmacros.h               |  24 ++++++
 10 files changed, 292 insertions(+), 7 deletions(-)
---