Pārlūkot izejas kodu

Merge remote branch 'sebastian/bug2444'

Nick Mathewson 13 gadi atpakaļ
vecāks
revīzija
0ba69714b4
2 mainītis faili ar 6 papildinājumiem un 0 dzēšanām
  1. 4 0
      changes/bug2444
  2. 2 0
      src/or/config.c

+ 4 - 0
changes/bug2444

@@ -0,0 +1,4 @@
+  o Minor features:
+    - If we did find a configuration file, log a message saying where we found
+      it during startup. Implements ticket 2444.
+

+ 2 - 0
src/or/config.c

@@ -4093,6 +4093,8 @@ load_torrc_from_disk(int argc, char **argv)
           "Unable to open configuration file \"%s\".", fname);
       goto err;
     }
+  } else {
+    log(LOG_NOTICE, LD_CONFIG, "Read configuration file \"%s\".", fname);
   }
 
   return cf;