[tor-commits] [tor/master] Merge branch 'bug29085_rebase'

[asn at torproject.org]

commit a7779df84c97acf3f245786566bd72dd9968b99f
Merge: f664c0c31 5f47d582d
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed May 15 15:13:08 2019 +0300

    Merge branch 'bug29085_rebase'

 changes/bug29085                         |   4 +
 scripts/maint/practracker/exceptions.txt |   1 +
 src/core/or/circuitpadding.c             | 269 ++++++++++++++++++++--------
 src/core/or/circuitpadding.h             |   5 +-
 src/test/test_circuitpadding.c           | 295 +++++++++++++++++++++++++------
 5 files changed, 441 insertions(+), 133 deletions(-)