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

[nickm at torproject.org]

commit 58fd864a85fc58650ac7c7c48a68f7a49de38260
Merge: 17ff69a26 cdaff26f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 13 09:36:47 2019 -0400

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

 changes/bug29298               |   6 +
 src/core/or/circuitpadding.c   | 258 ++++++++++++++++++++++++++---------------
 src/core/or/circuitpadding.h   | 103 +++++++++++-----
 src/test/test_circuitpadding.c | 138 +++++++++++++---------
 4 files changed, 326 insertions(+), 179 deletions(-)