Merge remote-tracking branch 'public/bug4533_part1'

Conflicts:
	src/common/compat.h

diff --cc src/common/compat.h
index 5bf12cdf8982b1a00a54687fa5c84fa2a2b6ecd7,1b79565c0bc138e68c6e494d3017bc3de7023997..4329d45369802c220b9036ebfff0c0a74104c129
--- 1/src/common/compat.h
--- 2/src/common/compat.h
+++ b/src/common/compat.h
@@@ -399,11 -399,19 +399,19 @@@ typedef int socklen_t
  #endif
  
  #ifdef MS_WINDOWS
+ /* XXX Actually, this should arguably be SOCKET; we use intptr_t here so that
+  * any inadvertant checks for the socket being <= 0 or > 0 will probably
+  * still work. */
  #define tor_socket_t intptr_t
 -#define SOCKET_OK(s) ((unsigned)(s) != INVALID_SOCKET)
 +#define SOCKET_OK(s) ((SOCKET)(s) != INVALID_SOCKET)
+ #define TOR_INVALID_SOCKET INVALID_SOCKET
  #else
+ /** Type used for a network socket. */
  #define tor_socket_t int
+ /** Macro: true iff 's' is a possible value for a valid initialized socket. */
  #define SOCKET_OK(s) ((s) >= 0)
+ /** Error/uninitialized value for a tor_socket_t. */
+ #define TOR_INVALID_SOCKET (-1)
  #endif
  
  int tor_close_socket(tor_socket_t s);