[tor-commits] [tor/maint-0.4.2] Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

[nickm at torproject.org]

commit fd1686c7d8df8d8159fcaab1c59dfabe154afd88
Merge: ff5220536 fff1054d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 13 09:12:48 2020 -0500

    Merge branch 'ticket33290_v2_041' into ticket33290_v2_042

 changes/ticket33290           |  4 ++++
 src/core/or/circuitmux.c      |  8 ++++++--
 src/core/or/circuitmux_ewma.c | 12 +++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)