summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2019-11-12 13:19:12 -0500
committerNick Mathewson <nickm@torproject.org>2019-11-12 13:19:12 -0500
commitfc1316b559a387710201649395593680bcaa242f (patch)
tree80941f67f16bf97f780627c85b83b7e0cd63d0db /doc
parentf221a7aaf6f05670f0d19f66c792d3b96f385f43 (diff)
parent6d9db29ddae9e4086e878ed049c5fc91304db761 (diff)
downloadtor-fc1316b559a387710201649395593680bcaa242f.tar.gz
tor-fc1316b559a387710201649395593680bcaa242f.zip
Merge branch 'ticket32467'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index a3c05961e3..b2f6f59ca1 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -96,6 +96,13 @@ The following options in this section are only recognized on the
[[opt-verify-config]] **`--verify-config`**::
Verify whether the configuration file is valid.
+[[opt-dump-config]] **`--dump-config`** **`short`**|**`full`**|**`non-builtin`**::
+ Write a complete list of Tor's configured options to standard output.
+ When the `short` flag is selected, only write the options that
+ are different from their default values. When `non-builtin` is selected,
+ write options that are not zero or the empty string.
+ When `full` is selected, write every option.
+
[[opt-serviceinstall]] **`--service install`** [**`--options`** __command-line options__]::
Install an instance of Tor as a Windows service, with the provided
command-line options. Current instructions can be found at