nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-07-18 23:17:57 -04:00
commit e1d3b44495
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug9295 Normal file
View 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.

1
src/or/config.c
View File

@ -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);