Merge remote-tracking branch 'origin/maint-0.2.4'

diff --cc src/common/compat.c
index 3768933edf0d984af5fb45ec35c3a7f835396ece,d88c5f92dec40ab8010c7640374f1bd1a5c3786d..d6ea41878ada195457a7b084395d6b8b118c0155
--- 1/src/common/compat.c
--- 2/src/common/compat.c
+++ b/src/common/compat.c
@@@ -1313,12 -1225,12 +1313,12 @@@ tor_ersatz_socketpair(int family, int t
       * for now, and really, when localhost is down sometimes, we
       * have other problems too.
       */
-     tor_socket_t listener = -1;
-     tor_socket_t connector = -1;
-     tor_socket_t acceptor = -1;
+     tor_socket_t listener = TOR_INVALID_SOCKET;
+     tor_socket_t connector = TOR_INVALID_SOCKET;
+     tor_socket_t acceptor = TOR_INVALID_SOCKET;
      struct sockaddr_in listen_addr;
      struct sockaddr_in connect_addr;
 -    int size;
 +    socklen_t size;
      int saved_errno = -1;
  
      if (protocol
@@@ -1394,15 -1306,15 +1394,15 @@@
    tidy_up_and_fail:
      if (saved_errno < 0)
        saved_errno = errno;
-     if (listener != -1)
+     if (SOCKET_OK(listener))
        tor_close_socket(listener);
-     if (connector != -1)
+     if (SOCKET_OK(connector))
        tor_close_socket(connector);
-     if (acceptor != -1)
+     if (SOCKET_OK(acceptor))
        tor_close_socket(acceptor);
      return -saved_errno;
 -#endif
  }
 +#endif
  
  /** Number of extra file descriptors to keep in reserve beyond those that we
   * tell Tor it's allowed to use. */