diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-10 16:01:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-10 16:01:29 -0500 |
| commit | c79a24f50521383221fcc9ec5c5871fb4d547383 (patch) | |
| tree | e10b14f82a7daee082bd870f3c857d1662eff976 /doc | |
| parent | e460586a13875c0dac988365ce7993ef97660572 (diff) | |
| parent | d37660d3f366c6749d241623ebce4733279509ee (diff) | |
| download | tor-c79a24f50521383221fcc9ec5c5871fb4d547383.tar.gz tor-c79a24f50521383221fcc9ec5c5871fb4d547383.zip | |
Merge remote-tracking branch 'origin/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 fa21f466d0..bc18b2fbfa 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1100,7 +1100,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 |