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

[nickm at torproject.org]

commit c40d53ab3925638a04bd6d9088e748e0ea16cabf
Merge: 968d2b87c ff410edec
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 8 10:25:43 2019 -0500

    Merge branch 'pr_719_squashed_040' into maint-0.4.0

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