tor

commit fc1316b559a387710201649395593680bcaa242f
parent f221a7aaf6f05670f0d19f66c792d3b96f385f43
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 12 Nov 2019 13:19:12 -0500

Merge branch 'ticket32467'

Diffstat:
A
changes/ticket32467
 | 
3
+++
M
doc/tor.1.txt
 | 
7
+++++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/changes/ticket32467 b/changes/ticket32467
@@ -0,0 +1,3 @@
+  o Documentation:
+    - Describe the --dump-config command in the manual page. Closes ticket
+      32467.
diff --git 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