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

Merge branch 'maint-0.3.3' into release-0.3.3

This commit is contained in:
Nick Mathewson 2018-04-20 14:39:48 -04:00
parent d8a9c9f2c8 cb813a352c
commit 84ff776893
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/25857 Normal file
View File

@ -0,0 +1,3 @@
o Documentation:
- Correct an IPv6 error in the documentation for ExitPolicy.
Closes ticket 25857. Patch from "CTassisF".

4
doc/tor.1.txt
View File

@ -1835,8 +1835,8 @@ is non-zero):
"**accept[6]**|**reject[6]** __ADDR__[/__MASK__][:__PORT__]". If /__MASK__ is
omitted then this policy just applies to the host given. Instead of giving
a host or network you can also use "\*" to denote the universe (0.0.0.0/0
and ::/128), or \*4 to denote all IPv4 addresses, and \*6 to denote all
IPv6 addresses.
and ::/0), or \*4 to denote all IPv4 addresses, and \*6 to denote all IPv6
addresses.
__PORT__ can be a single port number, an interval of ports
"__FROM_PORT__-__TO_PORT__", or "\*". If __PORT__ is omitted, that means
"\*". +