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

[nickm at torproject.org]

commit cec647ff3eab20c97a744a59b808eb49760acfd3
Merge: 5f4e14b8c 78bcfc128
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 13:56:03 2020 -0400

    Merge branch 'trove_2020_004_041_v2' into maint-0.4.1

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