diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-07-18 23:17:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-07-18 23:17:57 -0400 |
| commit | e1d3b444952d861e4fbe01b5a9b0bd2985892f41 (patch) | |
| tree | 56b757bee40faf54b4acb655041c41468b1e65fe /src/or | |
| parent | f45e1fbd5b25735c75bed8767d9d50e279c4b63a (diff) | |
| parent | 17a960734aa7db59580e647bf67f6ecf587b54c9 (diff) | |
| download | tor-e1d3b444952d861e4fbe01b5a9b0bd2985892f41.tar.gz tor-e1d3b444952d861e4fbe01b5a9b0bd2985892f41.zip | |
Merge remote-tracking branch 'origin/maint-0.2.4'
Diffstat (limited to 'src/or')
| -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 2218e5078b..ad6689ceef 100644 --- a/src/or/config.c +++ b/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); |