commit 9bdcfe51e28e4f522173f21da34283d5f1ba728c Merge: 0d2dcc15c 4ee269941 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Mar 17 13:56:10 2020 -0400 Merge branch 'maint-0.4.2' into release-0.4.2 changes/ticket33619 | 5 +++++ src/core/or/circuitpadding.c | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)