Merge branch 'mh/maint-http-proxy-fix'

* mh/maint-http-proxy-fix:
  Set proxy override with http_init()

diff --cc builtin-http-fetch.c
Simple merge

diff --cc http-push.c
Simple merge

diff --cc transport.c
Simple merge