diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-10 16:01:19 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-10 16:01:19 -0500 |
| commit | d37660d3f366c6749d241623ebce4733279509ee (patch) | |
| tree | 9189fef6dee39a75cb7b152aa656d958b3bb542a /doc | |
| parent | 7abb74e4ac3f284f0682764dd5f26571dd624c13 (diff) | |
| parent | 6f07363e72b2ba7424ec64d3f294e2646a620705 (diff) | |
| download | tor-d37660d3f366c6749d241623ebce4733279509ee.tar.gz tor-d37660d3f366c6749d241623ebce4733279509ee.zip | |
Merge remote-tracking branch 'rransom/bug2089' into maint-0.2.2
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt index c0957fc236..e5dae8cb27 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -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 |