commit f2756e0d3407d900aba029b9fc77f2e1c4189073 Author: David Goulet dgoulet@torproject.org Date: Mon Jan 9 10:09:58 2017 -0500

control: Fix some indentation issues and a key value

Apart from the indentation, the "download/" key for the GETINFO command is wrong, it's actually "downloads/" so fixing that.

Signed-off-by: David Goulet dgoulet@torproject.org --- control-spec.txt | 80 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/control-spec.txt b/control-spec.txt index 82524bb..0d08f96 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -882,8 +882,8 @@

[New in Tor 0.2.7.2-alpha]

- "onions/current" - "onions/detached" + "onions/current" + "onions/detached" A newline-separated list of the Onion ("Hidden") Services created via the "ADD_ONION" command. The 'current' key returns Onion Services belonging to the current control connection. The 'detached' key @@ -893,12 +893,12 @@ HSAddress [New in Tor 0.2.7.1-alpha.]

- "network-liveness" + "network-liveness" The string "up" or "down", indicating whether we currently believe the network is reachable.

- "download/" - The keys under download/ are used to query download statuses; they all + "downloads/" + The keys under downloads/ are used to query download statuses; they all return either a sequence of newline-terminated hex encoded digests, or a serialized download status as follows:

@@ -930,67 +930,67 @@ In detail, the keys supported are:

"downloads/networkstatus/ns" - The serialized download status for the FLAV_NS consensus for whichever - bootstrap state Tor is currently in. + The serialized download status for the FLAV_NS consensus for whichever + bootstrap state Tor is currently in.

"downloads/networkstatus/ns/bootstrap" - The serialized download status for the FLAV_NS consensus at bootstrap - time, regardless of whether we are currently bootstrapping. + The serialized download status for the FLAV_NS consensus at bootstrap + time, regardless of whether we are currently bootstrapping.

"downloads/networkstatus/ns/running" - The serialized download status for the FLAV_NS consensus when running, - regardless of whether we are currently bootstrapping. + The serialized download status for the FLAV_NS consensus when running, + regardless of whether we are currently bootstrapping.

"downloads/networkstatus/microdesc" - The serialized download status for the FLAV_MICRODESC consensus for - whichever bootstrap state Tor is currently in. + The serialized download status for the FLAV_MICRODESC consensus for + whichever bootstrap state Tor is currently in.

"downloads/networkstatus/microdesc/bootstrap" - The serialized download status for the FLAV_MICRODESC consensus at - bootstrap time, regardless of whether we are currently bootstrapping. + The serialized download status for the FLAV_MICRODESC consensus at + bootstrap time, regardless of whether we are currently bootstrapping.

"downloads/networkstatus/microdesc/running" - The serialized download status for the FLAV_MICRODESC consensus when - running, regardless of whether we are currently bootstrapping. + The serialized download status for the FLAV_MICRODESC consensus when + running, regardless of whether we are currently bootstrapping.

"downloads/cert/fps" - A newline-separated list of hex-encoded digests for authority certificates - for which we have download status available. + A newline-separated list of hex-encoded digests for authority certificates + for which we have download status available.

"downloads/cert/fp/<Fingerprint>" - A serialized download status for the default certificate for the - identity digest <Fingerprint> returned by the downloads/cert/fps key. + A serialized download status for the default certificate for the + identity digest <Fingerprint> returned by the downloads/cert/fps key.

"downloads/cert/fp/<Fingerprint>/sks" - A newline-separated list of hex-encoded signing key digests for the - authority identity digest <Fingerprint> returned by the - downloads/cert/fps key. + A newline-separated list of hex-encoded signing key digests for the + authority identity digest <Fingerprint> returned by the + downloads/cert/fps key.

"downloads/cert/fp/<Fingerprint>/<SKDigest>" - A serialized download status for the certificate for the identity - digest <Fingerprint> returned by the downloads/cert/fps key and signing - key digest <SKDigest> returned by the downloads/cert/fp/<Fingerprint>/ - sks key. + A serialized download status for the certificate for the identity + digest <Fingerprint> returned by the downloads/cert/fps key and signing + key digest <SKDigest> returned by the downloads/cert/fp/<Fingerprint>/ + sks key.

"downloads/desc/descs" - A newline-separated list of hex-encoded router descriptor digests - [note, not identity digests - the Tor process may not have seen them - yet while downloading router descriptors]. If the Tor process is not - using a FLAV_NS consensus, a 551 error is returned. + A newline-separated list of hex-encoded router descriptor digests + [note, not identity digests - the Tor process may not have seen them + yet while downloading router descriptors]. If the Tor process is not + using a FLAV_NS consensus, a 551 error is returned.

"downloads/desc/<Digest>" - A serialized download status for the router descriptor with digest - <Digest> as returned by the downloads/desc/descs key. If the Tor - process is not using a FLAV_NS consensus, a 551 error is returned. + A serialized download status for the router descriptor with digest + <Digest> as returned by the downloads/desc/descs key. If the Tor + process is not using a FLAV_NS consensus, a 551 error is returned.

"downloads/bridge/bridges" - A newline-separated list of hex-encoded bridge identity digests. If - the Tor process is not using bridges, a 551 error is returned. + A newline-separated list of hex-encoded bridge identity digests. If + the Tor process is not using bridges, a 551 error is returned.

"downloads/bridge/<Digest>" - A serialized download status for the bridge descriptor with identity - digest <Digest> as returned by the downloads/bridge/bridges key. If - the Tor process is not using bridges, a 551 error is returned. + A serialized download status for the bridge descriptor with identity + digest <Digest> as returned by the downloads/bridge/bridges key. If + the Tor process is not using bridges, a 551 error is returned.

Examples: C: GETINFO version desc/name/moria1