commit affaaa1968ceed8d33b11168221887dbb52f0285 parent acdd349dee9edf1b3af354f3c8decb91ee267ba0 Author: Nick Mathewson <nickm@torproject.org> Date: Wed, 1 Nov 2017 13:50:06 -0400 Merge branch 'maint-0.3.2' Diffstat:
| A | changes/bug24115 | | | 4 | ++++ |
| M | doc/tor.1.txt | | | 2 | +- |
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/changes/bug24115 b/changes/bug24115 @@ -0,0 +1,4 @@ + o Minor bugfixes (manpage, hidden service): + - Mention that the HiddenServiceNumIntroductionPoints option is 0-10 for + v2 service and 0-20 for v3 service. Fixes bug 24115; bugfix on + 0.3.2.1-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt @@ -2544,7 +2544,7 @@ The following options are used to configure a hidden service. [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__:: Number of introduction points the hidden service will have. You can't - have more than 10. (Default: 3) + have more than 10 for v2 service and 20 for v3. (Default: 3) [[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**:: **Experimental - Non Anonymous** Hidden Services on a tor instance in