diff options
| author | teor <teor@torproject.org> | 2019-06-11 14:46:24 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-06-11 14:46:24 +1000 |
| commit | cb20054ccda422ddf5af29d4bf5c55fa3a701e1f (patch) | |
| tree | 31337b204fed6832be6b47d8fe9a2ebf62fe5bef /src/test/test_key_expiration.sh | |
| parent | e5deb2bbc73d8830ae6c479a4532e72112f5484a (diff) | |
| parent | 12b9bfc05f3a163b44f0f8b6638f027de16e622b (diff) | |
| download | tor-cb20054ccda422ddf5af29d4bf5c55fa3a701e1f.tar.gz tor-cb20054ccda422ddf5af29d4bf5c55fa3a701e1f.zip | |
Merge remote-tracking branch 'tor-github/pr/924' into maint-0.3.5
Diffstat (limited to 'src/test/test_key_expiration.sh')
| -rwxr-xr-x | src/test/test_key_expiration.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/test_key_expiration.sh b/src/test/test_key_expiration.sh index cf6608634d..3474210607 100755 --- a/src/test/test_key_expiration.sh +++ b/src/test/test_key_expiration.sh @@ -66,10 +66,11 @@ trap "rm -rf '$DATA_DIR'" 0 DATA_DIR=`cd "${DATA_DIR}" && pwd` touch "${DATA_DIR}/empty_torrc" +touch "${DATA_DIR}/empty_defaults_torrc" QUIETLY="--hush" SILENTLY="--quiet" -TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f ${DATA_DIR}/empty_torrc --DataDirectory ${DATA_DIR}" +TOR="${TOR_BINARY} --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 --DataDirectory ${DATA_DIR} -f ${DATA_DIR}/empty_torrc --defaults-torrc ${DATA_DIR}/empty_defaults_torrc" ##### SETUP # |