[tor-commits] [chutney/master] Merge remote-tracking branch 'nickm/misc_bugs'

[teor at torproject.org]

commit 3a3c1d5020d259e1243b8b4bd28be9c417b2c002
Merge: 8822169 dcaa921
Author: teor <teor2345 at gmail.com>
Date:   Mon May 8 15:50:58 2017 +1000

    Merge remote-tracking branch 'nickm/misc_bugs'

 lib/chutney/Traffic.py | 35 ++++++++++++++++++++++++++++++-----
 1 file changed, 30 insertions(+), 5 deletions(-)