[tor-commits] [sbws/master] fix: tests: Remove all the `\t` in torrc files

commit a8c91d0baec7f77c69347bf676ca095175095030 Author: juga0 juga@riseup.net Date: Tue Jun 23 13:32:31 2020 +0000

fix: tests: Remove all the `\t` in torrc files

at the beginning of the line and in empty lines. They are not needed. --- tests/integration/net/auth1/torrc | 55 +++++++++++++++--------------- tests/integration/net/auth2/torrc | 55 +++++++++++++++--------------- tests/integration/net/auth3/torrc | 55 +++++++++++++++--------------- tests/integration/net/exit1/torrc | 40 +++++++++++----------- tests/integration/net/exit2/torrc | 40 +++++++++++----------- tests/integration/net/exit3/torrc | 40 +++++++++++----------- tests/integration/net/relay1/torrc | 34 +++++++++--------- tests/integration/net/relay1mbyteMAB/torrc | 34 +++++++++--------- tests/integration/net/relay1mbyteRBR/torrc | 34 +++++++++--------- tests/integration/net/relay2/torrc | 34 +++++++++--------- tests/integration/net/relay3/torrc | 34 +++++++++--------- tests/integration/net/relay4/torrc | 34 +++++++++--------- tests/integration/net/relay5/torrc | 34 +++++++++--------- tests/integration/net/relay6/torrc | 34 +++++++++--------- tests/integration/net/relay7/torrc | 34 +++++++++--------- 15 files changed, 294 insertions(+), 297 deletions(-)

diff --git a/tests/integration/net/auth1/torrc b/tests/integration/net/auth1/torrc index 464a7fd..1318647 100644 --- a/tests/integration/net/auth1/torrc +++ b/tests/integration/net/auth1/torrc @@ -1,34 +1,33 @@

- DataDirectory auth1 - PidFile auth1/tor.pid - Log notice file auth1/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.1 - SocksPort 127.10.0.1:2000 - ControlPort 127.10.0.1:2001 - CookieAuthentication 1 - ORPort 127.10.0.1:2002 - DirPort 127.10.0.1:2003 - Nickname auth1 - ContactInfo pastly@torproject.org - +DataDirectory auth1 +PidFile auth1/tor.pid +Log notice file auth1/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.1 +SocksPort 127.10.0.1:2000 +ControlPort 127.10.0.1:2001 +CookieAuthentication 1 +ORPort 127.10.0.1:2002 +DirPort 127.10.0.1:2003 +Nickname auth1 +ContactInfo pastly@torproject.org + + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2

- TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/auth2/torrc b/tests/integration/net/auth2/torrc index 7e941ae..f3529e3 100644 --- a/tests/integration/net/auth2/torrc +++ b/tests/integration/net/auth2/torrc @@ -1,34 +1,33 @@

- DataDirectory auth2 - PidFile auth2/tor.pid - Log notice file auth2/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.2 - SocksPort 127.10.0.2:2000 - ControlPort 127.10.0.2:2001 - CookieAuthentication 1 - ORPort 127.10.0.2:2002 - DirPort 127.10.0.2:2003 - Nickname auth2 - ContactInfo pastly@torproject.org - +DataDirectory auth2 +PidFile auth2/tor.pid +Log notice file auth2/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.2 +SocksPort 127.10.0.2:2000 +ControlPort 127.10.0.2:2001 +CookieAuthentication 1 +ORPort 127.10.0.2:2002 +DirPort 127.10.0.2:2003 +Nickname auth2 +ContactInfo pastly@torproject.org + + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2

- TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 - DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/auth3/torrc b/tests/integration/net/auth3/torrc index 2ee6c60..70ddf2e 100644 --- a/tests/integration/net/auth3/torrc +++ b/tests/integration/net/auth3/torrc @@ -1,34 +1,33 @@

- DataDirectory auth3 - PidFile auth3/tor.pid - Log notice file auth3/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - AuthoritativeDirectory 1 - V3AuthoritativeDirectory 1 - Address 127.10.0.3 - SocksPort 127.10.0.3:2000 - ControlPort 127.10.0.3:2001 - CookieAuthentication 1 - ORPort 127.10.0.3:2002 - DirPort 127.10.0.3:2003 - Nickname auth3 - ContactInfo pastly@torproject.org - +DataDirectory auth3 +PidFile auth3/tor.pid +Log notice file auth3/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +AuthoritativeDirectory 1 +V3AuthoritativeDirectory 1 +Address 127.10.0.3 +SocksPort 127.10.0.3:2000 +ControlPort 127.10.0.3:2001 +CookieAuthentication 1 +ORPort 127.10.0.3:2002 +DirPort 127.10.0.3:2003 +Nickname auth3 +ContactInfo pastly@torproject.org

- TestingV3AuthInitialVotingInterval 5 - V3AuthVotingInterval 10 - TestingV3AuthInitialVoteDelay 2 - V3AuthVoteDelay 2 - TestingV3AuthInitialDistDelay 2 - V3AuthDistDelay 2 + +TestingV3AuthInitialVotingInterval 5 +V3AuthVotingInterval 10 +TestingV3AuthInitialVoteDelay 2 +V3AuthVoteDelay 2 +TestingV3AuthInitialDistDelay 2 +V3AuthDistDelay 2

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 -DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C +DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 - +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit1/torrc b/tests/integration/net/exit1/torrc index 89ba9bf..10b22bd 100644 --- a/tests/integration/net/exit1/torrc +++ b/tests/integration/net/exit1/torrc @@ -1,26 +1,26 @@

- DataDirectory exit1 - PidFile exit1/tor.pid - Log notice file exit1/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.11 - SocksPort 127.10.0.11:2000 - ControlPort 127.10.0.11:2001 - CookieAuthentication 1 - ORPort 127.10.0.11:2002 - DirPort 127.10.0.11:2003 - Nickname exit1 - ContactInfo pastly@torproject.org +DataDirectory exit1 +PidFile exit1/tor.pid +Log notice file exit1/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.11 +SocksPort 127.10.0.11:2000 +ControlPort 127.10.0.11:2001 +CookieAuthentication 1 +ORPort 127.10.0.11:2002 +DirPort 127.10.0.11:2003 +Nickname exit1 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit2/torrc b/tests/integration/net/exit2/torrc index c4c4708..244b632 100644 --- a/tests/integration/net/exit2/torrc +++ b/tests/integration/net/exit2/torrc @@ -1,26 +1,26 @@

- DataDirectory exit2 - PidFile exit2/tor.pid - Log notice file exit2/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.12 - SocksPort 127.10.0.12:2000 - ControlPort 127.10.0.12:2001 - CookieAuthentication 1 - ORPort 127.10.0.12:2002 - DirPort 127.10.0.12:2003 - Nickname exit2 - ContactInfo pastly@torproject.org +DataDirectory exit2 +PidFile exit2/tor.pid +Log notice file exit2/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.12 +SocksPort 127.10.0.12:2000 +ControlPort 127.10.0.12:2001 +CookieAuthentication 1 +ORPort 127.10.0.12:2002 +DirPort 127.10.0.12:2003 +Nickname exit2 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/exit3/torrc b/tests/integration/net/exit3/torrc index 622ef54..ddfbcfe 100644 --- a/tests/integration/net/exit3/torrc +++ b/tests/integration/net/exit3/torrc @@ -1,26 +1,26 @@

- DataDirectory exit3 - PidFile exit3/tor.pid - Log notice file exit3/notice.log - ShutdownWaitLength 2 - ExitRelay 1 - IPv6Exit 1 - ExitPolicy accept *:* - ExitPolicy reject *:* - Address 127.10.0.13 - SocksPort 127.10.0.13:2000 - ControlPort 127.10.0.13:2001 - CookieAuthentication 1 - ORPort 127.10.0.13:2002 - DirPort 127.10.0.13:2003 - Nickname exit3 - ContactInfo pastly@torproject.org +DataDirectory exit3 +PidFile exit3/tor.pid +Log notice file exit3/notice.log +ShutdownWaitLength 2 +ExitRelay 1 +IPv6Exit 1 +ExitPolicy accept *:* +ExitPolicy reject *:* +Address 127.10.0.13 +SocksPort 127.10.0.13:2000 +ControlPort 127.10.0.13:2001 +CookieAuthentication 1 +ORPort 127.10.0.13:2002 +DirPort 127.10.0.13:2003 +Nickname exit3 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay1/torrc b/tests/integration/net/relay1/torrc index 0a5ef3b..bde5f91 100644 --- a/tests/integration/net/relay1/torrc +++ b/tests/integration/net/relay1/torrc @@ -1,23 +1,23 @@

- DataDirectory relay1 - PidFile relay1/tor.pid - Log notice file relay1/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.4 - SocksPort 127.10.0.4:2000 - ControlPort 127.10.0.4:2001 - CookieAuthentication 1 - ORPort 127.10.0.4:2002 - DirPort 127.10.0.4:2003 - Nickname relay1 - ContactInfo pastly@torproject.org +DataDirectory relay1 +PidFile relay1/tor.pid +Log notice file relay1/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.4 +SocksPort 127.10.0.4:2000 +ControlPort 127.10.0.4:2001 +CookieAuthentication 1 +ORPort 127.10.0.4:2002 +DirPort 127.10.0.4:2003 +Nickname relay1 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay1mbyteMAB/torrc b/tests/integration/net/relay1mbyteMAB/torrc index 192a48f..ed45e10 100644 --- a/tests/integration/net/relay1mbyteMAB/torrc +++ b/tests/integration/net/relay1mbyteMAB/torrc @@ -1,25 +1,25 @@

- DataDirectory relay1mbyteMAB - PidFile relay1mbyteMAB/tor.pid - Log notice file relay1mbyteMAB/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.14 - SocksPort 127.10.0.14:2000 - ControlPort 127.10.0.14:2001 - CookieAuthentication 1 - ORPort 127.10.0.14:2002 - DirPort 127.10.0.14:2003 - Nickname relay1mbyteMAB - ContactInfo pastly@torproject.org +DataDirectory relay1mbyteMAB +PidFile relay1mbyteMAB/tor.pid +Log notice file relay1mbyteMAB/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.14 +SocksPort 127.10.0.14:2000 +ControlPort 127.10.0.14:2001 +CookieAuthentication 1 +ORPort 127.10.0.14:2002 +DirPort 127.10.0.14:2003 +Nickname relay1mbyteMAB +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0

MaxAdvertisedBandwidth 1 MByte diff --git a/tests/integration/net/relay1mbyteRBR/torrc b/tests/integration/net/relay1mbyteRBR/torrc index 4f345e6..bf27cc0 100644 --- a/tests/integration/net/relay1mbyteRBR/torrc +++ b/tests/integration/net/relay1mbyteRBR/torrc @@ -1,25 +1,25 @@

- DataDirectory relay1mbyteRBR - PidFile relay1mbyteRBR/tor.pid - Log notice file relay1mbyteRBR/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.15 - SocksPort 127.10.0.15:2000 - ControlPort 127.10.0.15:2001 - CookieAuthentication 1 - ORPort 127.10.0.15:2002 - DirPort 127.10.0.15:2003 - Nickname relay1mbyteRBR - ContactInfo pastly@torproject.org +DataDirectory relay1mbyteRBR +PidFile relay1mbyteRBR/tor.pid +Log notice file relay1mbyteRBR/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.15 +SocksPort 127.10.0.15:2000 +ControlPort 127.10.0.15:2001 +CookieAuthentication 1 +ORPort 127.10.0.15:2002 +DirPort 127.10.0.15:2003 +Nickname relay1mbyteRBR +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0

RelayBandwidthRate 1 MByte diff --git a/tests/integration/net/relay2/torrc b/tests/integration/net/relay2/torrc index bc333ec..a3d49f1 100644 --- a/tests/integration/net/relay2/torrc +++ b/tests/integration/net/relay2/torrc @@ -1,23 +1,23 @@

- DataDirectory relay2 - PidFile relay2/tor.pid - Log notice file relay2/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.5 - SocksPort 127.10.0.5:2000 - ControlPort 127.10.0.5:2001 - CookieAuthentication 1 - ORPort 127.10.0.5:2002 - DirPort 127.10.0.5:2003 - Nickname relay2 - ContactInfo pastly@torproject.org +DataDirectory relay2 +PidFile relay2/tor.pid +Log notice file relay2/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.5 +SocksPort 127.10.0.5:2000 +ControlPort 127.10.0.5:2001 +CookieAuthentication 1 +ORPort 127.10.0.5:2002 +DirPort 127.10.0.5:2003 +Nickname relay2 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay3/torrc b/tests/integration/net/relay3/torrc index 29526a4..04d6a9f 100644 --- a/tests/integration/net/relay3/torrc +++ b/tests/integration/net/relay3/torrc @@ -1,23 +1,23 @@

- DataDirectory relay3 - PidFile relay3/tor.pid - Log notice file relay3/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.6 - SocksPort 127.10.0.6:2000 - ControlPort 127.10.0.6:2001 - CookieAuthentication 1 - ORPort 127.10.0.6:2002 - DirPort 127.10.0.6:2003 - Nickname relay3 - ContactInfo pastly@torproject.org +DataDirectory relay3 +PidFile relay3/tor.pid +Log notice file relay3/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.6 +SocksPort 127.10.0.6:2000 +ControlPort 127.10.0.6:2001 +CookieAuthentication 1 +ORPort 127.10.0.6:2002 +DirPort 127.10.0.6:2003 +Nickname relay3 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay4/torrc b/tests/integration/net/relay4/torrc index 8444566..8d7ffa2 100644 --- a/tests/integration/net/relay4/torrc +++ b/tests/integration/net/relay4/torrc @@ -1,23 +1,23 @@

- DataDirectory relay4 - PidFile relay4/tor.pid - Log notice file relay4/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.7 - SocksPort 127.10.0.7:2000 - ControlPort 127.10.0.7:2001 - CookieAuthentication 1 - ORPort 127.10.0.7:2002 - DirPort 127.10.0.7:2003 - Nickname relay4 - ContactInfo pastly@torproject.org +DataDirectory relay4 +PidFile relay4/tor.pid +Log notice file relay4/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.7 +SocksPort 127.10.0.7:2000 +ControlPort 127.10.0.7:2001 +CookieAuthentication 1 +ORPort 127.10.0.7:2002 +DirPort 127.10.0.7:2003 +Nickname relay4 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay5/torrc b/tests/integration/net/relay5/torrc index 894be6a..82d995d 100644 --- a/tests/integration/net/relay5/torrc +++ b/tests/integration/net/relay5/torrc @@ -1,23 +1,23 @@

- DataDirectory relay5 - PidFile relay5/tor.pid - Log notice file relay5/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.8 - SocksPort 127.10.0.8:2000 - ControlPort 127.10.0.8:2001 - CookieAuthentication 1 - ORPort 127.10.0.8:2002 - DirPort 127.10.0.8:2003 - Nickname relay5 - ContactInfo pastly@torproject.org +DataDirectory relay5 +PidFile relay5/tor.pid +Log notice file relay5/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.8 +SocksPort 127.10.0.8:2000 +ControlPort 127.10.0.8:2001 +CookieAuthentication 1 +ORPort 127.10.0.8:2002 +DirPort 127.10.0.8:2003 +Nickname relay5 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay6/torrc b/tests/integration/net/relay6/torrc index a86d48c..f33d71a 100644 --- a/tests/integration/net/relay6/torrc +++ b/tests/integration/net/relay6/torrc @@ -1,23 +1,23 @@

- DataDirectory relay6 - PidFile relay6/tor.pid - Log notice file relay6/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.9 - SocksPort 127.10.0.9:2000 - ControlPort 127.10.0.9:2001 - CookieAuthentication 1 - ORPort 127.10.0.9:2002 - DirPort 127.10.0.9:2003 - Nickname relay6 - ContactInfo pastly@torproject.org +DataDirectory relay6 +PidFile relay6/tor.pid +Log notice file relay6/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.9 +SocksPort 127.10.0.9:2000 +ControlPort 127.10.0.9:2001 +CookieAuthentication 1 +ORPort 127.10.0.9:2002 +DirPort 127.10.0.9:2003 +Nickname relay6 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0 diff --git a/tests/integration/net/relay7/torrc b/tests/integration/net/relay7/torrc index 12d8609..d7a4842 100644 --- a/tests/integration/net/relay7/torrc +++ b/tests/integration/net/relay7/torrc @@ -1,23 +1,23 @@

- DataDirectory relay7 - PidFile relay7/tor.pid - Log notice file relay7/notice.log - ShutdownWaitLength 2 - ExitRelay 0 - Address 127.10.0.10 - SocksPort 127.10.0.10:2000 - ControlPort 127.10.0.10:2001 - CookieAuthentication 1 - ORPort 127.10.0.10:2002 - DirPort 127.10.0.10:2003 - Nickname relay7 - ContactInfo pastly@torproject.org +DataDirectory relay7 +PidFile relay7/tor.pid +Log notice file relay7/notice.log +ShutdownWaitLength 2 +ExitRelay 0 +Address 127.10.0.10 +SocksPort 127.10.0.10:2000 +ControlPort 127.10.0.10:2001 +CookieAuthentication 1 +ORPort 127.10.0.10:2002 +DirPort 127.10.0.10:2003 +Nickname relay7 +ContactInfo pastly@torproject.org

DirAuthority auth1 orport=2002 no-v2 v3ident=3668D8876241ADD04B53CAB08E7442BDE6EC9A06 127.10.0.1:2003 AA45C13025C037F056E734169891878ED0880231 DirAuthority auth2 orport=2002 no-v2 v3ident=100036EB705CDCFB1746B450C23B861F554A3630 127.10.0.2:2003 E7B3C9A0040D628DAC88B0251AE6334D28E8F531 DirAuthority auth3 orport=2002 no-v2 v3ident=4EC8AA0B0F120205EEE32C9918F1D99214ADF518 127.10.0.3:2003 35E3B8BB71C81355649AEC5862ECB7ED7EFDBC5C

- TestingTorNetwork 1 - NumCPUs 1 - LogTimeGranularity 1 - SafeLogging 0 +TestingTorNetwork 1 +NumCPUs 1 +LogTimeGranularity 1 +SafeLogging 0