include file flaw and yet another socks5-fix

CHANGES

@@ -6,6 +6,13 @@
 
                                   Changelog
 
+Daniel (26 May)
+- Chris Lewis pointed out a flaw in the #ifdefs in curl/multi.h for Windows,
+  which is now corrected.
+
+- Jis Joy found another flaw in the SOCK5 code, as libcurl treated the socks5
+  proxy a little too much like as if it was a http proxy.
+
 Daniel (23 May)
 - Ricardo Cadime found a socket leak when listing directories without
   contents. Test cases 144 and 145 were added to verify the fix.