[glib: 2/2] Merge branch 'fix-tlscertificate-parse-bug' into 'master'

[Michael Catanzaro <mcatanzaro src gnome org>]

commit c46565d56a94d960109ff819f13d5c4f3bba721d
Merge: 27369def5 feff178c3
Author: Michael Catanzaro <mcatanzaro posteo net>
Date:   Fri Dec 14 21:23:04 2018 +0000

    Merge branch 'fix-tlscertificate-parse-bug' into 'master'
    
    gtlscertificate: Fix bug in PEM private key parser
    
    See merge request GNOME/glib!534
    
    Also see discussion in GNOME/glib!520

 gio/gtlscertificate.c       |  2 +-
 gio/tests/tls-certificate.c | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)
---