[tor-commits] [chutney/master] Merge branch 'tor-termination'

[teor at torproject.org]

commit 8822169d7f18d93809f05ab433be389c7562bdb3
Merge: 876933c 5adda26
Author: teor <teor2345 at gmail.com>
Date:   Mon May 8 15:37:39 2017 +1000

    Merge branch 'tor-termination'
    
    Multiple options were added to the README, this resolves the conflict.

 README                   | 18 ++++++++----
 lib/chutney/TorNet.py    | 73 +++++++++++++++++++++++++++++++++++-------------
 tools/test-network.sh    | 13 ++++++++-
 torrc_templates/common.i |  7 ++++-
 4 files changed, 84 insertions(+), 27 deletions(-)

diff --cc README
index 8030842,ac6e1bd..7779e84
--- a/README
+++ b/README
@@@ -57,11 -57,11 +57,13 @@@ Warning Options
    --only-warnings    CHUTNEY_WARNINGS_ONLY=true
  
  Expert Options:
 -  --controlling-pid  CHUTNEY_CONTROLLING_PID
 +  --debug            CHUTNEY_DEBUG=true
    --coverage         USE_COVERAGE_BINARY=true
--  --net-dir          CHUTNEY_DATA_DIR
    --dry-run          NETWORK_DRY_RUN=true
    --quiet            ECHO=true
++
++  --controlling-pid  CHUTNEY_CONTROLLING_PID
++  --net-dir          CHUTNEY_DATA_DIR
    (These are advanced options: in the past, they have had long-standing bugs.)
  
  Standard Actions: