commit 87db5a6b758db2e0a69c34acfc2481a91018d9aa Merge: b5a8fd156 3d9dcb49e Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 6 11:36:13 2018 -0500

Merge remote-tracking branch 'arma/bug22212'

changes/bug22212-forreal | 8 ++++++++ src/or/connection_or.c | 9 +++++++++ 2 files changed, 17 insertions(+)

diff --cc src/or/connection_or.c index 8379f5803,85459b62e..455bb66cb --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@@ -592,6 -591,13 +592,10 @@@ connection_or_flushed_some(or_connectio { size_t datalen;

+ /* Update the channel's active timestamp if there is one */ + if (conn->chan) + channel_timestamp_active(TLS_CHAN_TO_BASE(conn->chan)); + - /* The channel will want to update its estimated queue size */ - channel_update_xmit_queue_size(TLS_CHAN_TO_BASE(conn->chan)); - /* If we're under the low water mark, add cells until we're just over the * high water mark. */ datalen = connection_get_outbuf_len(TO_CONN(conn));