Set torrc_fname in load_torrc_from_disk

Bugfix on commit 230422b955e1708f27f42cdd25e8b21a33fdd3dd, not yet in any
release. Fixes bug #4604; reported by koolfy.

diff --git a/src/or/config.c b/src/or/config.c
index f0686dae4ca892bf7fce63e8ea7c960fe3094fb5..e92b01dabf92fddb7756cccdfa2ed665abc36e3d 100644 (file)
--- 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);