diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-05-29 21:20:02 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-05-29 21:20:02 +0300 |
| commit | 650bdca97f2bf45b27fe8ae0f9a2da5cbf36f959 (patch) | |
| tree | fe0a6e20cd8728e0b85424f808e4794cc0dd4bd5 /src/test/zero_length_keys.sh | |
| parent | 24a2352d56d807320c45fcdd8c74435bda4302c2 (diff) | |
| parent | 00108b75d4c0f02a7fa5aba240e4b60f79bf4d1d (diff) | |
| download | tor-650bdca97f2bf45b27fe8ae0f9a2da5cbf36f959.tar.gz tor-650bdca97f2bf45b27fe8ae0f9a2da5cbf36f959.zip | |
Merge branch 'maint-0.4.0'
Diffstat (limited to 'src/test/zero_length_keys.sh')
| -rwxr-xr-x | src/test/zero_length_keys.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/test/zero_length_keys.sh b/src/test/zero_length_keys.sh index 4069148e0b..1702d11245 100755 --- a/src/test/zero_length_keys.sh +++ b/src/test/zero_length_keys.sh @@ -43,10 +43,11 @@ fi trap 'rm -rf "$DATA_DIR"' 0 touch "$DATA_DIR"/empty_torrc +touch "$DATA_DIR"/empty_defaults_torrc # DisableNetwork means that the ORPort won't actually be opened. # 'ExitRelay 0' suppresses a warning. -TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc" +TOR="${TOR_BINARY} --hush --DisableNetwork 1 --ShutdownWaitLength 0 --ORPort 12345 --ExitRelay 0 -f $DATA_DIR/empty_torrc --defaults-torrc $DATA_DIR/empty_defaults_torrc" if [ -s "$DATA_DIR"/keys/secret_id_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key ] && [ -s "$DATA_DIR"/keys/secret_onion_key_ntor ]; then |