commit cdd438923096a893e7dbe52ef8c3cd2c962ad59b Merge: 9bb251f c5ed158 Author: teor teor@torproject.org Date: Fri Apr 12 12:38:27 2019 +1000

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

.travis.yml | 1 + lib/chutney/Debug.py | 18 ++++++++++- lib/chutney/Templating.py | 2 +- lib/chutney/TorNet.py | 2 +- lib/chutney/Traffic.py | 8 ++--- tests/unit-tests.sh | 78 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 102 insertions(+), 7 deletions(-)