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

This commit is contained in:
Nick Mathewson 2011-02-10 16:01:19 -05:00
commit d37660d3f3

View File

@ -1069,7 +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