[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

[nickm at torproject.org]

commit da1130413611de7951351ad32d1c29e88790a9fc
Merge: 089ef4606 3ccf91027
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 26 10:06:02 2019 -0400

    Merge branch 'maint-0.4.1'

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