[glib: 2/2] Merge branch 'master' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 04af8f12f0a0e46298682cacecde755793aa8dc5
Merge: 095333870 9032e8897
Author: Philip Withnall <philip tecnocode co uk>
Date:   Wed Dec 19 12:01:50 2018 +0000

    Merge branch 'master' into 'master'
    
    GTlsConnection: add ALPN support
    
    See merge request GNOME/glib!520

 docs/reference/gio/gio-sections.txt |   4 ++
 gio/gdtlsconnection.c               |  91 +++++++++++++++++++++++++
 gio/gdtlsconnection.h               |  13 ++++
 gio/gtlsconnection.c                | 131 +++++++++++++++++++++++++++++++++++-
 gio/gtlsconnection.h                |   7 ++
 5 files changed, 244 insertions(+), 2 deletions(-)
---