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

diff --cc src/or/channeltls.c
index 9a290778f537da0c68f6beba2eb108b832390329,495f85622712bef970a261e237d14d2ecfddfa6a..e76bae3da29cdc319a268bc4c4da839400f74f38
--- 1/src/or/channeltls.c
--- 2/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@@ -401,37 -399,15 +402,39 @@@ channel_tls_get_remote_addr_method(chan
  
    tor_assert(tlschan);
    tor_assert(addr_out);
-   tor_assert(tlschan->conn);
  
-   tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr));
+   if (tlschan->conn) {
+     tor_addr_copy(addr_out, &(TO_CONN(tlschan->conn)->addr));
+     rv = 1;
+   } else tor_addr_make_unspec(addr_out);
  
-   return 1;
+   return rv;
  }
  
 +/**
 + * Get the name of the pluggable transport used by a channel_tls_t.
 + *
 + * This implements the get_transport_name for channel_tls_t. If the
 + * channel uses a pluggable transport, copy its name to
 + * <b>transport_out</b> and return 0. If the channel did not use a
 + * pluggable transport, return -1. */
 +
 +static int
 +channel_tls_get_transport_name_method(channel_t *chan, char **transport_out)
 +{
 +  channel_tls_t *tlschan = BASE_CHAN_TO_TLS(chan);
 +
 +  tor_assert(tlschan);
 +  tor_assert(transport_out);
 +  tor_assert(tlschan->conn);
 +
 +  if (!tlschan->conn->ext_or_transport)
 +    return -1;
 +
 +  *transport_out = tor_strdup(tlschan->conn->ext_or_transport);
 +  return 0;
 +}
 +
  /**
   * Get endpoint description of a channel_tls_t
   *

diff --cc src/or/connection.c
Simple merge

diff --cc src/or/connection_or.c
Simple merge