commit e423447f53f3a1b3b72cea3e52f345143e847d48 Merge: de8e0ef 919bf6f Author: Nick Mathewson nickm@torproject.org Date: Mon May 16 11:12:22 2011 -0400

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

Conflicts: src/or/connection.c

changes/bug2850 | 5 +++++ src/or/connection.c | 34 +++++++++++++++++++++++----------- 2 files changed, 28 insertions(+), 11 deletions(-)

diff --cc src/or/connection.c index 17411e0,5054909..50acec3 --- 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. */