commit 6803373aab2292fe7286d1e19e25d5016b6ac9b8 Merge: bc4c89eb2 4ee269941 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 17 13:56:10 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

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