[glib] (3 commits) Non-fast-forward update to branch mcatanzaro/#2597

[Michael Catanzaro <mcatanzaro src gnome org>]

The branch 'mcatanzaro/#2597' was changed in a way that was not a fast-forward update.
NOTE: This may cause problems for people pulling from the branch. For more information,
please see:

 https://wiki.gnome.org/Git/Help/NonFastForward

Commits removed from the branch:

  7b573b7... proxyaddressenumerator: always set error on first enumerati
  1d1f305... gsimpleproxyresolver: default_proxy should be consistently 
  8c00c81... gsimpleproxyresolver: ensure default proxy is valid

Commits added to the branch:

  9a20707... gsimpleproxyresolver: default_proxy should be consistently 
  b137d35... gsimpleproxyresolver: ensure default proxy is valid
  c1e2f82... proxyaddressenumerator: set error parameter more thoughtful