Merge remote-tracking branch 'arma/bug22212'

diff --cc src/or/connection_or.c
index 8379f58030adb3f9c7fa6d8a98e89fd2a30db30c,85459b62e8ba4294805b1136f98dde55d767cb00..455bb66cb301d7f108ddb506309c4d9f937e6870
--- 1/src/or/connection_or.c
--- 2/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;
  
 -  /* The channel will want to update its estimated queue size */
 -  channel_update_xmit_queue_size(TLS_CHAN_TO_BASE(conn->chan));
 -
+   /* Update the channel's active timestamp if there is one */
+   if (conn->chan)
+     channel_timestamp_active(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));