diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-29 20:28:08 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-29 20:28:08 -0500 |
| commit | fdc0aa8c458f13c3a5ad65e680326119c1e26ac1 (patch) | |
| tree | f6f02f797e7efeb3b9f8e31c46adb76d23d863e5 | |
| parent | 8bb23c7def49e5a090d337e56eee8398261d9fb6 (diff) | |
| parent | e70610878afe63f5c58798edf3648e0cb54b157a (diff) | |
| download | tor-fdc0aa8c458f13c3a5ad65e680326119c1e26ac1.tar.gz tor-fdc0aa8c458f13c3a5ad65e680326119c1e26ac1.zip | |
Merge remote-tracking branch 'rransom-tor/bug4605'
| -rw-r--r-- | src/or/config.c | 2 | ||||
| -rw-r--r-- | src/or/control.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index ab991a4f6e..a0cf3c80ad 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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); diff --git a/src/or/control.c b/src/or/control.c index 8d924b44f1..e2d0eece02 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -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, |