[glib: 15/15] Merge branch 'uri-tweaks' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit e30fc2e116b02d99636f3570c0c608b6b42d7b72
Merge: 602b7cca3 cacf9c292
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri Aug 7 14:14:29 2020 +0000

    Merge branch 'uri-tweaks' into 'master'
    
    Various GUri code, documentation and API fixes
    
    Closes #2149
    
    See merge request GNOME/glib!1610

 fuzzing/fuzz_uri_parse.c   |   2 +-
 gio/gnetworkaddress.c      |   2 +-
 gio/gproxyresolver.c       |   4 +-
 gio/gsimpleproxyresolver.c |   2 +-
 glib/guri.c                | 506 ++++++++++++++++++++++++++++-----------------
 glib/guri.h                |  72 ++++---
 glib/tests/uri.c           | 188 ++++++++++-------
 7 files changed, 476 insertions(+), 300 deletions(-)
---