Merge branch 'jc/http-socks5h' into maint

The socks5:// proxy support added back in 2.6.4 days was not aware
that socks5h:// proxies behave differently.

* jc/http-socks5h:
http: differentiate socks5:// and socks5h://

diff --cc http.c
Simple merge