Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

diff --cc src/or/connection_edge.c
index 87efb15da7ea56953b1252631856bf994991eddc,4caa01cb501750cc683e08f99f496373b48e1393..4ae0ccf36a2c8121b3ef97e67274df7866c5bc91
--- 1/src/or/connection_edge.c
--- 2/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@@ -1476,10 -1430,14 +1491,15 @@@ connection_ap_handshake_rewrite_and_att
        const char *new_addr;
        new_addr = addressmap_register_virtual_address(
                                RESOLVED_TYPE_IPV4, tor_strdup(socks->address));
-       tor_assert(new_addr);
+       if (! new_addr) {
+         log_warn(LD_APP, "Unable to automap address %s",
+                  escaped_safe_str(socks->address));
+         connection_mark_unattached_ap(conn, END_STREAM_REASON_INTERNAL);
+         return -1;
+       }
        log_info(LD_APP, "Automapping %s to %s",
 -               escaped_safe_str(socks->address), safe_str(new_addr));
 +               escaped_safe_str_client(socks->address),
 +               safe_str_client(new_addr));
        strlcpy(socks->address, new_addr, sizeof(socks->address));
      }
    }