commit f5f677362d48f0d83ee349f642bda4e5dfd1c7dc Merge: c16848c df1d0a1 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 8 15:54:44 2014 -0400

Merge remote-tracking branches 'teor/issue-13161-template-tweaks' and 'teor/issue-13161-check-torrc-options'

lib/chutney/TorNet.py | 157 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 145 insertions(+), 12 deletions(-)