From 5977435629d6f075e63fdc6ea8f1587be69b6b76 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 18 Jul 2013 23:08:36 -0400 Subject: [PATCH 1/2] tmp --- src/or/config.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/config.c b/src/or/config.c index d5c5689474..e4901f2eee 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4691,6 +4691,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); From e9c24843119b74431f3ebd338dea58537b60795c Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 18 Jul 2013 23:15:46 -0400 Subject: [PATCH 2/2] Fix for bug 9295: Don't crash when running --hash-password. Fix on 0.2.4.15-rc; I'm doing this branch against 0.2.3, since we're considering #9122 for an 0.2.3 backport, and if we do, we should merge this too. --- changes/bug9295 | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 changes/bug9295 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. +