From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 14 May 2019 23:20:53 +0000 (-0400)
Subject: Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
X-Git-Tag: tor-0.4.1.1-alpha~15^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c95bdb83b1bbbde51b21e30aaed16b406ed7ec5;p=thirdparty%2Ftor.git

Merge branch 'ticket30452_035_v3' into ticket30452_041_v3
---

1c95bdb83b1bbbde51b21e30aaed16b406ed7ec5
diff --cc doc/tor.1.txt
index 8cb85fc351,f46929897b..4bd365c774
--- 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