[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1

[nickm at torproject.org]

commit 3ccf91027b9fa39182372060e3e92841403f4b5b
Merge: 648d5df62 a15ec8bf8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 26 10:05:51 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1101' into maint-0.4.1

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