commit d6033843a49ff029d9f8d070b3c1f446a6edc9fa Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 19 11:27:52 2014 -0400

When looking for conns to close, count the age of linked queued data

Specifically, count the age of the data queued in a linked directory connection's buffers when counting a stream's age. --- src/or/circuitlist.c | 5 +++++ 1 file changed, 5 insertions(+)

diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index bcdd858..6853420 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1925,6 +1925,11 @@ circuit_get_streams_max_data_age(const edge_connection_t *stream, uint32_t now) age2 = conn_get_buffer_age(conn, now); if (age2 > age) age = age2; + if (conn->linked_conn) { + age2 = conn_get_buffer_age(conn->linked_conn, now); + if (age2 > age) + age = age2; + } } return age; }