diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-18 23:17:05 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-18 23:17:05 -0400 |
| commit | 17a960734aa7db59580e647bf67f6ecf587b54c9 (patch) | |
| tree | 9bb26752b9abc0c2294aef204106c79d58899f71 | |
| parent | c36bdbd53521a9b7d2213cde1f9f0f8fe8ac7441 (diff) | |
| parent | e9c24843119b74431f3ebd338dea58537b60795c (diff) | |
| download | tor-17a960734aa7db59580e647bf67f6ecf587b54c9.tar.gz tor-17a960734aa7db59580e647bf67f6ecf587b54c9.zip | |
Merge remote-tracking branch 'public/bug9295_023' into maint-0.2.4
| -rw-r--r-- | changes/bug9295 | 4 | ||||
| -rw-r--r-- | src/or/config.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/changes/bug9295 b/changes/bug9295 new file mode 100644 index 0000000000..2c113616c3 --- /dev/null +++ b/changes/bug9295 @@ -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. + diff --git a/src/or/config.c b/src/or/config.c index 725190a96d..bf82643b91 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3714,6 +3714,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); |