From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 16 May 2011 15:12:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~114
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e423447f53f3a1b3b72cea3e52f345143e847d48;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/connection.c
---

e423447f53f3a1b3b72cea3e52f345143e847d48
diff --cc src/or/connection.c
index 17411e01f8,5054909df9..50acec32a3
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@@ -1411,7 -1378,9 +1421,9 @@@ connection_connect(connection_t *conn, 
    log_debug(LD_NET, "Connecting to %s:%u.",
              escaped_safe_str_client(address), port);
  
+   make_socket_reuseable(s);
+ 
 -  if (connect(s, dest_addr, dest_addr_len) < 0) {
 +  if (connect(s, dest_addr, (socklen_t)dest_addr_len) < 0) {
      int e = tor_socket_errno(s);
      if (!ERRNO_IS_CONN_EINPROGRESS(e)) {
        /* yuck. kill it. */