Merge remote branch 'sebastian/bug2444'

This commit is contained in:
Nick Mathewson 2011-02-22 11:10:57 -05:00
commit 0ba69714b4
2 changed files with 6 additions and 0 deletions

4
changes/bug2444 Normal file
View File

@ -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.

View File

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