[tor-commits] [tor/release-0.4.3] Merge branch 'ticket33290_v2_043' into maint-0.4.3

[nickm at torproject.org]

commit 6c5307e42f74d4f0b0a0541fa7e8fe3cb246403a
Merge: d0c335021 baeff46d3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 13 10:47:32 2020 -0500

    Merge branch 'ticket33290_v2_043' into maint-0.4.3

 changes/ticket33290           | 4 ++++
 src/core/or/circuitmux.c      | 8 ++++++--
 src/core/or/circuitmux_ewma.c | 4 +++-
 src/core/or/circuitmux_ewma.h | 9 ++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)