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

[dgoulet at torproject.org]

commit 044bb019b6959ce71e5f28ae537890a5860a3678
Merge: cfb15d513 af26cd610
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Jul 25 10:27:41 2019 -0400

    Merge branch 'maint-0.4.1'

 changes/bug31024             |  4 ++++
 changes/bug31027             |  3 +++
 src/core/or/circuitpadding.c | 15 ++++++++++-----
 3 files changed, 17 insertions(+), 5 deletions(-)