diff options
| author | Robert Ransom <rransom.8774@gmail.com> | 2011-11-29 17:11:49 -0800 |
|---|---|---|
| committer | Robert Ransom <rransom.8774@gmail.com> | 2011-11-29 17:11:49 -0800 |
| commit | 4150d92eea48ddf44c001b0c87833b0101051d3e (patch) | |
| tree | 465b035abf8149c7ad74f4dcf5f97017fd39ba64 /src/or | |
| parent | 83f66db79ec6469beea0fb410be6536acb90ffd0 (diff) | |
| download | tor-4150d92eea48ddf44c001b0c87833b0101051d3e.tar tor-4150d92eea48ddf44c001b0c87833b0101051d3e.tar.gz | |
Set torrc_fname in load_torrc_from_disk
Bugfix on commit 230422b955e1708f27f42cdd25e8b21a33fdd3dd, not yet in any
release. Fixes bug #4604; reported by koolfy.
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index f0686dae4..e92b01dab 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4385,7 +4385,7 @@ load_torrc_from_disk(int argc, char **argv, int defaults_file) char *cf = NULL; int using_default_torrc = 1; int ignore_missing_torrc = 0; - char **fname_var = defaults_file ? &torrc_fname : &torrc_defaults_fname; + char **fname_var = defaults_file ? &torrc_defaults_fname : &torrc_fname; fname = find_torrc_filename(argc, argv, defaults_file, &using_default_torrc, &ignore_missing_torrc); |