commit b9b3c6f225e69fdef84bbf9a17cc0f0e166b0a18 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 23 12:08:55 2012 -0500

Add a couple more missing GETINFO items --- control-spec.txt | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt index 50ffc9e..3a2e04c 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -466,6 +466,11 @@

"config-file" -- The location of Tor's configuration file ("torrc").

+ "config-defaults-file" -- The location of Tor's configuration + defaults file ("torrc.defaults"). This file gets parsed before + torrc, and is typically used to replace Tor's default + configuration values. + "config-text" -- The contents that Tor would write if you send it a SAVECONF command, so the controller can write the file to disk itself. [First implemented in 0.2.2.7-alpha.] @@ -659,6 +664,10 @@ A space-separated list of all the features supported by this version of Tor's USEFEATURE.

+ "signal/names" + A space-separated list of all the values supported by the SIGNAL + command. + "ip-to-country/*" Maps IP addresses to 2-letter country codes. For example, "GETINFO ip-to-country/18.0.0.1" should give "US".