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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); |