- Hans-Jurgen May pointed out that trying SCP or SFTP over a SOCKS proxy

crashed libcurl. This is now addressed by making sure we use "plain send"
  internally when doing the socks handshake instead of the Curl_write()
  function which is designed to use the "target" protocol. That's then SCP or
  SFTP in this case. I also took the opportunity and cleaned up some ssh-
  related #ifdefs in the code for readability.

RELEASE-NOTES

@@ -22,6 +22,7 @@ This release includes the following bugfixes:
  o Fixed the multi interface connection re-use with NSS-built libcurl
  o connection re-use when using the multi interface with pipelining enabled
  o curl_multi_socket() socket callback fix for close/re-create sockets case
+ o SCP or SFTP over socks proxy crashed
 
 This release includes the following known bugs:
 
@@ -39,6 +40,6 @@ This release would not have looked like this without help, code, reports and
 advice from friends like these:
 
  Lenny Rachitsky, Axel Tillequin, Arnaud Ebalard, Yang Tse, Dan Fandrich,
- Rob Crittenden, Dengminwen, Christopher Palow
+ Rob Crittenden, Dengminwen, Christopher Palow, Hans-J<>rgen May
 
         Thanks! (and sorry if I forgot to mention someone)