[tor-commits] [chutney/master] Merge remote-tracking branch 'linus/bug8531'

[nickm at torproject.org]

commit 0351b06584cec37254dec1f6c8281f22b7798c22
Merge: 1678c99 2b948b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 24 13:08:15 2013 -0400

    Merge remote-tracking branch 'linus/bug8531'

 lib/chutney/TorNet.py  |   36 +++++-
 lib/chutney/Traffic.py |  328 ++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 361 insertions(+), 3 deletions(-)