commit 1c95bdb83b1bbbde51b21e30aaed16b406ed7ec5 Merge: 43d411945 1b16fcb70 Author: Nick Mathewson nickm@torproject.org Date: Tue May 14 19:20:53 2019 -0400

Merge branch 'ticket30452_035_v3' into ticket30452_041_v3

changes/bug30452 | 3 +++ doc/tor.1.txt | 4 ++++ src/app/config/config.c | 13 +++++++++++++ src/feature/dirauth/authmode.h | 4 ++++ 4 files changed, 24 insertions(+)

diff --cc doc/tor.1.txt index 8cb85fc35,f46929897..4bd365c77 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -88,10 -88,12 +88,14 @@@ COMMAND-LINE OPTION List all valid options that are scheduled to become obsolete in a future version. (This is a warning, not a promise.)

+ [[opt-list-modules]] **--list-modules**:: + For each optional module, list whether or not it has been compiled + into Tor. (Any module not listed is not optional in this version of Tor.) + [[opt-version]] **--version**:: - Display Tor version and exit. + Display Tor version and exit. The output is a single line of the format + "Tor version [version number]." (The version number format + is as specified in version-spec.txt.)

[[opt-quiet]] **--quiet**|**--hush**:: Override the default console log. By default, Tor starts out logging