[tor-commits] [tor/master] Merge branch 'maint-0.4.3'

[nickm at torproject.org]

commit 1ab7c052317943ea43bf99b4032a7cb19f373f5c
Merge: e231d84dd 6c5307e42
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 13 10:47:43 2020 -0500

    Merge branch '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(-)