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

Conflicts:
	src/or/connection.c

diff --cc src/or/connection.c
index 17411e01f8b6a4b9e184c49fd3cd557d57cf0aef,5054909df931813aa2842e80d3d68e5c0c65c1f8..50acec32a33ea6afcba0a413f85ef29d201e6aba
--- 1/src/or/connection.c
--- 2/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);
  
 -  if (connect(s, dest_addr, dest_addr_len) < 0) {
+   make_socket_reuseable(s);
+ 
 +  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. */