[tor-commits] [tor/release-0.4.0] Merge branch 'maint-0.4.0' into release-0.4.0

[asn at torproject.org]

commit 8a158b82ba8a36ab32508a3d941270fd32e6939b
Merge: 0ba45b297 071a000d6
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Apr 5 16:45:36 2019 +0300

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/bug29500               |   3 +
 src/core/or/circuitpadding.c   |   3 +-
 src/test/test_circuitpadding.c | 313 ++++++-----------------------------------
 3 files changed, 45 insertions(+), 274 deletions(-)