commit b2b779228d46334a03e62f0e07c2300adce5e0b3 Merge: 9cec7a7b5 84274000d Author: Nick Mathewson nickm@torproject.org Date: Fri May 17 08:18:20 2019 -0400

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

changes/ticket28634 | 10 + scripts/maint/practracker/exceptions.txt | 2 + src/app/main/shutdown.c | 1 + src/core/include.am | 2 + src/core/or/circuitpadding.c | 202 ++++++++------ src/core/or/circuitpadding.h | 23 +- src/core/or/circuitpadding_machines.c | 458 +++++++++++++++++++++++++++++++ src/core/or/circuitpadding_machines.h | 35 +++ src/test/test_circuitpadding.c | 223 ++++++++++++++- 9 files changed, 861 insertions(+), 95 deletions(-)