tor

commit 7a74b3663fdaa40fc84e48990d15953a8f46a2bf
parent b1fc383bdbb22526e5edfa5cc6b7a96a175fdde1
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 25 Jan 2018 13:57:37 -0500

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

Diffstat:
A
changes/bug25026
 | 
4
++++
M
doc/tor.1.txt
 | 
2
+-

2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug25026 b/changes/bug25026
@@ -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.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -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.
     (Default: 1)
 
-[[HiddenServiceVersion]] **HiddenServiceVersion** __version__,__version__,__...__::
+[[HiddenServiceVersion]] **HiddenServiceVersion** **2**|**3**::
     A list of rendezvous service descriptor versions to publish for the hidden
     service. Currently, versions 2 and 3 are supported. (Default: 2)