commit 49dceb969016975b5df5b2648ad42a17fa19905d Merge: 9543851 15dcdee Author: teor teor@torproject.org Date: Thu Jun 20 17:44:23 2019 +1000

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

lib/chutney/TorNet.py | 3 +- lib/chutney/Traffic.py | 609 +++++++++++++++++++++------------------- scripts/chutney_tests/verify.py | 7 +- 3 files changed, 323 insertions(+), 296 deletions(-)