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

[nickm at torproject.org]

commit d4595b344a1a32547c8578e1d62cee0beb63dc78
Merge: d3c4ed08f 6803373aa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Mar 17 13:56:10 2020 -0400

    Merge branch 'maint-0.4.3'

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