[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0

[nickm at torproject.org]

commit a56d7e37aa8f52397f9fd762d07b85f3360afd2a
Merge: 00108b75d 0c451b31d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 16:10:51 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0

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

diff --cc doc/tor.1.txt
index c2df7687f,f46929897..b9a48b680
--- 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