mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-10 21:23:58 +01:00
Merge remote branch 'sebastian/bug2444'
This commit is contained in:
commit
0ba69714b4
4
changes/bug2444
Normal file
4
changes/bug2444
Normal 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.
|
||||||
|
|
@ -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;
|
||||||
|
Loading…
Reference in New Issue
Block a user