nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 15:43:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'ahf-oniongit/bugs/25026'

Browse Source
This commit is contained in:
Nick Mathewson 2018-01-25 13:57:37 -05:00
commit 7a74b3663f
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug25026 Normal file
View File

@ -0,0 +1,4 @@
o Documentation:
- HiddenServiceVersion only accepts one version to be specified. This
version can either be version 2 or 3. Closes ticket 25026; bugfix on
0.3.2.2-alpha.

2
doc/tor.1.txt
View File

@ -2670,7 +2670,7 @@ The following options are used to configure a hidden service.
you're using a Tor controller that handles hidserv publishing for you. you're using a Tor controller that handles hidserv publishing for you.
(Default: 1) (Default: 1)
[[HiddenServiceVersion]] **HiddenServiceVersion** __version__,__version__,__...__:: [[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**::
A list of rendezvous service descriptor versions to publish for the hidden A list of rendezvous service descriptor versions to publish for the hidden
service. Currently, versions 2 and 3 are supported. (Default: 2) service. Currently, versions 2 and 3 are supported. (Default: 2)