From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Jun 2019 20:10:51 +0000 (-0400)
Subject: Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.4.0
X-Git-Tag: tor-0.4.1.2-alpha^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a56d7e37aa8f52397f9fd762d07b85f3360afd2a;p=thirdparty%2Ftor.git

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

a56d7e37aa8f52397f9fd762d07b85f3360afd2a
diff --cc doc/tor.1.txt
index c2df7687fe,f46929897b..b9a48b6800
--- 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