mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge remote-tracking branch 'origin/maint-0.2.4'
This commit is contained in:
commit
e1d3b44495
4
changes/bug9295
Normal file
4
changes/bug9295
Normal file
@ -0,0 +1,4 @@
|
||||
o Major bugfixes:
|
||||
- Avoid a crash when using --hash-password. Fixes bug 9295; bugfix on
|
||||
0.2.4.15-rc. Found by stem integration tests.
|
||||
|
@ -3828,6 +3828,7 @@ options_init_from_torrc(int argc, char **argv)
|
||||
}
|
||||
|
||||
if (command == CMD_HASH_PASSWORD) {
|
||||
cf_defaults = tor_strdup("");
|
||||
cf = tor_strdup("");
|
||||
} else {
|
||||
cf_defaults = load_torrc_from_disk(argc, argv, 1);
|
||||
|
Loading…
Reference in New Issue
Block a user