mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-11 05:33:47 +01:00
Merge remote-tracking branch 'rransom-tor/bug4605'
This commit is contained in:
commit
fdc0aa8c45
@ -4434,7 +4434,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);
|
||||
|
@ -2026,6 +2026,7 @@ typedef struct getinfo_item_t {
|
||||
static const getinfo_item_t getinfo_items[] = {
|
||||
ITEM("version", misc, "The current version of Tor."),
|
||||
ITEM("config-file", misc, "Current location of the \"torrc\" file."),
|
||||
ITEM("config-defaults-file", misc, "Current location of the defaults file."),
|
||||
ITEM("config-text", misc,
|
||||
"Return the string that would be written by a saveconf command."),
|
||||
ITEM("accounting/bytes", accounting,
|
||||
|
Loading…
Reference in New Issue
Block a user