From: Nick Mathewson <nickm@torproject.org>
Date: Fri, 19 Jul 2013 03:08:36 +0000 (-0400)
Subject: tmp
X-Git-Tag: tor-0.2.4.16-rc~9^2~1^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5977435629d6f075e63fdc6ea8f1587be69b6b76;p=thirdparty%2Ftor.git

tmp
---

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