[tor-commits] [tor/master] Merge branch 'pr_719_squashed'

[nickm at torproject.org]

commit e47e60c12ec64a8e9949c5fc60dea561d808490f
Merge: 8fd20df45 cd6791103
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 8 10:24:00 2019 -0500

    Merge branch 'pr_719_squashed'

 changes/bug29204             |  4 ++++
 src/core/or/circuitpadding.c | 21 +++++++++++++++++----
 2 files changed, 21 insertions(+), 4 deletions(-)