sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2017-11-01 13:50:06 -04:00
parent 8a8b5d590e 8687d9cf44
commit 588be5b028
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/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.

2
doc/tor.1.txt
View File

@ -2445,7 +2445,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