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

[teor at torproject.org]

commit 221be36512c6bb49519de1658057f331b59bf3ad
Merge: eda8e0631 1203e137b
Author: teor <teor at torproject.org>
Date:   Thu Sep 5 12:05:08 2019 +1000

    Merge branch 'maint-0.4.0' into release-0.4.0

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