nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'rransom-tor/bug4605'

Browse Source
This commit is contained in:
Nick Mathewson 2011-11-29 20:28:08 -05:00
commit fdc0aa8c45
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/or/config.c
View File

@ -4434,7 +4434,7 @@ load_torrc_from_disk(int argc, char **argv, int defaults_file)
char *cf = NULL; char *cf = NULL;
int using_default_torrc = 1; int using_default_torrc = 1;
int ignore_missing_torrc = 0; 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, fname = find_torrc_filename(argc, argv, defaults_file,
&using_default_torrc, &ignore_missing_torrc); &using_default_torrc, &ignore_missing_torrc);

1
src/or/control.c
View File

@ -2026,6 +2026,7 @@ typedef struct getinfo_item_t {
static const getinfo_item_t getinfo_items[] = { static const getinfo_item_t getinfo_items[] = {
ITEM("version", misc, "The current version of Tor."), ITEM("version", misc, "The current version of Tor."),
ITEM("config-file", misc, "Current location of the \"torrc\" file."), 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, ITEM("config-text", misc,
"Return the string that would be written by a saveconf command."), "Return the string that would be written by a saveconf command."),
ITEM("accounting/bytes", accounting, ITEM("accounting/bytes", accounting,