tor

commit d8ac7d557c0af199d21639a52a8c8c9dd201f555
parent 3bf9974b6c4ee9f2a8204c058e1b7c206b99d620
Author: Nick Mathewson <nickm@torproject.org>
Date:   Fri, 20 Apr 2018 14:40:09 -0400

Merge branch 'maint-0.3.3'

Diffstat:
A
changes/25857
 | 
3
+++
M
doc/tor.1.txt
 | 
4
++--

2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/changes/25857 b/changes/25857
@@ -0,0 +1,3 @@
+  o Documentation:
+    - Correct an IPv6 error in the documentation for ExitPolicy.
+      Closes ticket 25857.  Patch from "CTassisF".
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
@@ -1834,8 +1834,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
     "\*". +