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

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.
+

src/or/config.c

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