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

[nickm at torproject.org]

commit cab93930de8888981af63f157f71721ac233db34
Merge: 26b0d9539 8b64ff7a3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 13 10:37:37 2019 -0400

    Merge branch 'pr_722_squashed'

 configure.ac                   |  5 +++++
 src/core/or/circuitpadding.c   |  7 +++++--
 src/core/or/circuitpadding.h   | 11 ++++++++++-
 src/test/test_circuitpadding.c | 30 ++++++++++++++++--------------
 4 files changed, 36 insertions(+), 17 deletions(-)