commit b36c79cd738025b66b540bec42f2a13e523d5177 Merge: a49e68b 0414585 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 23 14:52:24 2014 -0500

Merge remote-tracking branch 'mvdan/master'

lib/chutney/Templating.py | 5 +- lib/chutney/TorNet.py | 121 +++++++++++++++++++++++---------------------- lib/chutney/Traffic.py | 27 ++++------ 3 files changed, 74 insertions(+), 79 deletions(-)