[tor-commits] [tor/main] Merge remote-tracking branch 'tor-gitlab/mr/412'

commit a9b287fbcc45ac5825599d42b3c024d4b8a88782 Merge: bc40c6af08 72aa23a9fd Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 23 15:06:06 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/412' changes/bug40435 | 4 ++++ src/core/or/circuitpadding.c | 19 +++++++++++++++---- src/test/test_circuitpadding.c | 6 ++---- 3 files changed, 21 insertions(+), 8 deletions(-)