[tor-commits] [sbws/master] Merge branch 'bug29046'

[juga at torproject.org]

commit 289757f9df3619e39002d25b05258956fa58bdd3
Merge: 878e21e 0e8f6a1
Author: juga0 <juga at riseup.net>
Date:   Thu Feb 28 11:53:09 2019 +0000

    Merge branch 'bug29046'

 tests/testnets/.gitignore                          |   8 -
 tests/testnets/run-network.sh                      |  43 -----
 tests/testnets/simple-ipv4/.net                    |   0
 tests/testnets/simple-ipv4/00-common.sh            |   7 -
 tests/testnets/simple-ipv4/01-gen-configs.sh       |   1 -
 tests/testnets/simple-ipv4/02-start-network.sh     |   1 -
 .../simple-ipv4/03-network-in-ready-state.py       |   1 -
 tests/testnets/simple-ipv4/04-stop-network.sh      |   1 -
 tests/testnets/simple-ipv4/html/alphabet.txt       |   1 -
 tests/testnets/simple-ipv6/.net                    |   0
 tests/testnets/simple-ipv6/00-common.sh            |   7 -
 tests/testnets/simple-ipv6/01-gen-configs.sh       |   1 -
 tests/testnets/simple-ipv6/02-start-network.sh     |   1 -
 .../simple-ipv6/03-network-in-ready-state.py       |   1 -
 tests/testnets/simple-ipv6/04-stop-network.sh      |   1 -
 tests/testnets/simple.common/01-gen-configs.sh     | 175 ---------------------
 tests/testnets/simple.common/02-start-network.sh   |  14 --
 .../simple.common/03-network-in-ready-state.py     | 126 ---------------
 tests/testnets/simple.common/04-stop-network.sh    |   3 -
 19 files changed, 392 deletions(-)