[or-cvs] [tor/master] Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2

[nickm@xxxxxxxxxxxxxx]

commit d37660d3f366c6749d241623ebce4733279509ee
Merge: 7abb74e 6f07363
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Feb 10 16:01:19 2011 -0500

    Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2

 doc/tor.1.txt |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --combined doc/tor.1.txt
index c0957fc,fc1ce73..e5dae8c
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -882,9 -882,9 +882,9 @@@ is non-zero)
      specified in ORPort. (Default: 0.0.0.0) This directive can be specified
      multiple times to bind to multiple addresses/ports.
  
 -**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**::
 +**PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**,**...**::
      This option specifies which descriptors Tor will publish when acting as
 -    a relay or hidden service. You can
 +    a relay. You can
      choose multiple arguments, separated by commas.
   +
      If this option is set to 0, Tor will not publish its
@@@ -892,7 -892,7 +892,7 @@@
      out your server, or if you're using a Tor controller that handles directory
      publishing for you.) Otherwise, Tor will publish its descriptors of all
      type(s) specified. The default is "1",
 -    which means "if running as a server or a hidden service, publish the
 +    which means "if running as a server, publish the
      appropriate descriptors to the authorities".
  
  **ShutdownWaitLength** __NUM__::
@@@ -1069,7 -1069,8 +1069,8 @@@ if DirPort is non-zero)
  
  **HSAuthoritativeDir** **0**|**1**::
      When this option is set in addition to **AuthoritativeDirectory**, Tor also
-     accepts and serves hidden service descriptors. (Default: 0)
+     accepts and serves v0 hidden service descriptors,
+     which are produced and used by Tor 0.2.1.x and older. (Default: 0)
  
  **HidServDirectoryV2** **0**|**1**::
      When this option is set, Tor accepts and serves v2 hidden service