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

[nickm at torproject.org]

commit c1560f6513269c1d929f7bc98e1961d1afd23574
Merge: 6031aa45f cec647ff3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 13:56:10 2020 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/ticket33619          | 5 +++++
 src/core/or/circuitpadding.c | 9 ++++++---
 2 files changed, 11 insertions(+), 3 deletions(-)