[tor-commits] [tor/master] Merge branch 'tor-github/pr/1934'

[asn at torproject.org]

commit 3bb9b7e743c5463e4516cdd53a02c319dc825290
Merge: a73049d1a c047c6d5b
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Jul 3 10:50:47 2020 +0300

    Merge branch 'tor-github/pr/1934'

 changes/bug32040                         |  7 ++++++
 scripts/maint/practracker/exceptions.txt |  4 ++--
 src/core/or/circuitpadding.c             | 39 ++++++++++++++++++++++++++------
 src/core/or/circuitpadding.h             | 14 ++++++++++--
 src/core/or/circuitpadding_machines.c    | 25 +++++++++++++-------
 src/test/test_circuitpadding.c           | 12 +++++-----
 6 files changed, 76 insertions(+), 25 deletions(-)