curl - cURL mirror with patches applied

Age	Commit message (Collapse)	Author
2017-02-09	cmdline-opts/socks: Mention --preproxy in --socks opts	Jay Satiro
	- Document in --socks* opts they're still mutually exclusive of --proxy. Partial revert of 423a93c; I had misinterpreted the SOCKS proxy + HTTP/HTTPS proxy combination. - Document in --socks* opts that --preproxy can be used to specify a SOCKS proxy at the same time --proxy is used with an HTTP/HTTPS proxy.
2016-12-16	preproxy: renamed what was added as SOCKS_PROXY	Daniel Stenberg
	CURLOPT_SOCKS_PROXY -> CURLOPT_PRE_PROXY Added the corresponding --preroxy command line option. Sets a SOCKS proxy to connect to _before_ connecting to a HTTP(S) proxy.