[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug9716_024'

[nickm at torproject.org]

commit 67bb1a44bd2af54d2475404b187c5475db7ea76d
Merge: 2f2fa76 a2754d4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 19 10:50:34 2013 -0400

    Merge remote-tracking branch 'public/bug9716_024'

 changes/bug9716     |    4 ++++
 src/or/connection.c |   23 ++++++++++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --cc src/or/connection.c
index 8c66a17,41946e4..8cf23ab
--- a/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;
        }
      }