Merge branch 'maint-0.3.2'

This commit is contained in:
Nick Mathewson 2017-11-01 13:50:06 -04:00
commit affaaa1968
2 changed files with 5 additions and 1 deletions

4
changes/bug24115 Normal file
View File

@ -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.

View File

@ -2544,7 +2544,7 @@ The following options are used to configure a hidden service.
[[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__:: [[HiddenServiceNumIntroductionPoints]] **HiddenServiceNumIntroductionPoints** __NUM__::
Number of introduction points the hidden service will have. You can't 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**:: [[HiddenServiceSingleHopMode]] **HiddenServiceSingleHopMode** **0**|**1**::
**Experimental - Non Anonymous** Hidden Services on a tor instance in **Experimental - Non Anonymous** Hidden Services on a tor instance in