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

diff --cc src/or/channeltls.c
index 42d6874d8da2b1bc52de362624843a464e00d446,d5428c1abdf0341efc9c300bb74678c73fdfbdda..959ec4744985f31ec8a27cc4d0c8852789e2b7f0
--- 1/src/or/channeltls.c
--- 2/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@@ -53,10 -53,9 +53,11 @@@ static void channel_tls_common_init(cha
  
  static void channel_tls_close_method(channel_t *chan);
  static const char * channel_tls_describe_transport_method(channel_t *chan);
+ static void channel_tls_free_method(channel_t *chan);
  static int
  channel_tls_get_remote_addr_method(channel_t *chan, tor_addr_t *addr_out);
 +static int
 +channel_tls_get_transport_name_method(channel_t *chan, char **transport_out);
  static const char *
  channel_tls_get_remote_descr_method(channel_t *chan, int flags);
  static int channel_tls_has_queued_writes_method(channel_t *chan);
@@@ -114,9 -113,9 +115,10 @@@ channel_tls_common_init(channel_tls_t *
    chan->state = CHANNEL_STATE_OPENING;
    chan->close = channel_tls_close_method;
    chan->describe_transport = channel_tls_describe_transport_method;
+   chan->free = channel_tls_free_method;
    chan->get_remote_addr = channel_tls_get_remote_addr_method;
    chan->get_remote_descr = channel_tls_get_remote_descr_method;
 +  chan->get_transport_name = channel_tls_get_transport_name_method;
    chan->has_queued_writes = channel_tls_has_queued_writes_method;
    chan->is_canonical = channel_tls_is_canonical_method;
    chan->matches_extend_info = channel_tls_matches_extend_info_method;