From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 6 Feb 2018 16:36:13 +0000 (-0500)
Subject: Merge remote-tracking branch 'arma/bug22212'
X-Git-Tag: tor-0.3.3.2-alpha~27
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87db5a6b758db2e0a69c34acfc2481a91018d9aa;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'arma/bug22212'
---

87db5a6b758db2e0a69c34acfc2481a91018d9aa
diff --cc src/or/connection_or.c
index 8379f58030,85459b62e8..455bb66cb3
--- 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));