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

diff --cc doc/tor.1.txt
index c2df7687fe83ce5b6405aaad6e2c67159a9674ee,f46929897b457bcf10eb2c73018a6d5f3c11ea37..b9a48b6800b6ea3884340925a6a36b1a9f7b47f9
--- 1/doc/tor.1.txt
--- 2/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

diff --cc src/app/config/config.c
Simple merge

diff --cc src/app/main/main.c
Simple merge