[tor-commits] [chutney/master] Merge remote-tracking branch 'teor/debug-on-fail'

[nickm at torproject.org]

commit 984f67249824a029f9f3b70c48e7280d9478d9cf
Merge: 8e4f5cb 39d4729
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 17 10:36:59 2016 -0400

    Merge remote-tracking branch 'teor/debug-on-fail'

 lib/chutney/TorNet.py | 4 ++++
 1 file changed, 4 insertions(+)