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

[nickm at torproject.org]

commit ec2bc07f420ea3c76222583f2275941818b99257
Merge: 5668287fe d235e523d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 29 13:57:50 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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