[glib: 3/3] Merge branch 'mcatanzaro/tls-docs' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit a5f824451f64eabc0d0a3a683f42ebb5bd75c812
Merge: e5d9eca33 08fe93589
Author: Philip Withnall <philip tecnocode co uk>
Date:   Tue Aug 7 09:46:30 2018 +0000

    Merge branch 'mcatanzaro/tls-docs' into 'master'
    
    Update TLS documentation
    
    See merge request GNOME/glib!199

 gio/gtlsclientconnection.c | 30 ++++++++++++++----------------
 gio/gtlsconnection.c       |  6 ++++--
 2 files changed, 18 insertions(+), 18 deletions(-)
---