Thank you for your feedback Daniel!

Hopefully this patch addresses your feedback. You're right
that the previous patch could break easy-mode - this one restores
the easy-mode behaviour.

You're also right that in an ideal world Curl_proxyCONNECT would
have been made nonblocking all the way through, but sadly it's a
case of finite time and having a really great (and really annoying)
real-world repro for the case this does nail, which is hopefully
the very worst culprit of blocking during tunnelling.

These patches are against libcurl 7.16.1 again. CURLPATCH6 is
for applying, CURLPATCH6w is an eyeball-friendly version without
whitespace diffs.

Let me know if you think this needs more fixing.

Cheers,
--Adam