Merge remote-tracking branch 'public/bug9716_024'

diff --cc src/or/connection.c
index 8c66a170e7b26634c10eff002e0c39f50e3d8339,41946e44854f64de69c8b8fc65f8ccd7612edc6e..8cf23ab0ef37b685ee59b9d968178891f45349c0
--- 1/src/or/connection.c
--- 2/src/or/connection.c
+++ b/src/or/connection.c
@@@ -1045,9 -1030,10 +1066,9 @@@ connection_listener_new(const struct so
      }
  
      if (is_tcp) {
-       if (listen(s,SOMAXCONN) < 0) {
+       if (tor_listen(s) < 0) {
          log_warn(LD_NET, "Could not listen on %s:%u: %s", address, usePort,
                   tor_socket_strerror(tor_socket_errno(s)));
 -        tor_close_socket(s);
          goto err;
        }
      }