[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1231'

[nickm at torproject.org]

commit e5812c91d6a682f9604032dde2285c87774ec3dd
Merge: 29bd43ab0 2ea2d6f30
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 19 11:34:27 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1231'

 src/core/or/circuitpadding.c | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)