[tor-commits] [tor/maint-0.4.1] Merge commit '763fd0ad66' into maint-0.4.0

[teor at torproject.org]

commit 1203e137be4303bce42e46bd41eb78bf79f691d7
Merge: a52a5e009 763fd0ad6
Author: teor <teor at torproject.org>
Date:   Thu Sep 5 11:42:26 2019 +1000

    Merge commit '763fd0ad66' into maint-0.4.0
    
    tor-github/pr/1174, but with the last commit re-worded to remove
    the fixup, because fixups break our push rules.

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