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

[nickm at torproject.org]

commit 4ff08309866e62cd6ace83813843c95177f60433
Merge: 89ca35ff5 3ccf91027
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 26 10:06:02 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 changes/bug30649             |  4 ++++
 src/core/or/circuitpadding.c | 33 +++++++++++++++++++++++----------
 2 files changed, 27 insertions(+), 10 deletions(-)