commit 60ec46a2ec6fef36ec1891e89e0d73572eb60bfd Author: Andrea Shepard andrea@torproject.org Date: Mon Oct 1 01:59:40 2012 -0700

Update circuitmux-related TODOs in channeltls.c --- src/or/channeltls.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/or/channeltls.c b/src/or/channeltls.c index 036d14f..bc7e3ec 100644 --- a/src/or/channeltls.c +++ b/src/or/channeltls.c @@ -129,10 +129,7 @@ channel_tls_connect(const tor_addr_t *addr, uint16_t port, channel_mark_outgoing(chan);

chan->cmux = circuitmux_alloc(); - /* TODO get rid of this and set policy once we have them - chan->cmux->active_circuit_pqueue_last_recalibrated = - cell_ewma_get_tick(); - */ + /* TODO set cmux policy */

/* Set up or_connection stuff */ tlschan->conn = connection_or_connect(addr, port, id_digest, tlschan); @@ -265,10 +262,7 @@ channel_tls_handle_incoming(or_connection_t *orconn) channel_mark_incoming(chan);

chan->cmux = circuitmux_alloc(); - /* TODO set cmux policy - chan->active_circuit_pqueue_last_recalibrated = - cell_ewma_get_tick(); - */ + /* TODO set cmux policy */

/* If we got one, we should register it */ if (chan) channel_register(chan);