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

[nickm at torproject.org]

commit 31a9caa274a3fbb57f82f2264028b9cabc56718f
Merge: 20a25b1ca c40d53ab3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 8 10:25:57 2019 -0500

    Merge branch 'maint-0.4.0' into release-0.4.0

 changes/bug29204             |  4 ++++
 src/core/or/circuitpadding.c | 21 +++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)