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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.1' into maint-0.4.2

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