summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2014-09-03 13:46:31 -0400
committerNick Mathewson <nickm@torproject.org>2014-09-03 13:46:31 -0400
commit06e8f4b370b4ddf096482dafb64ad7f394cbd28a (patch)
tree314428e1514300df17fb5a700a7695c568d82972
parent475c95f28a70fff665a4b6a608a4d3a61c2c77d9 (diff)
parentdcb4ee5b83b69234ef8fd0fce8533ab1c4434bd9 (diff)
downloadtor-06e8f4b370b4ddf096482dafb64ad7f394cbd28a.tar.gz
tor-06e8f4b370b4ddf096482dafb64ad7f394cbd28a.zip
Merge remote-tracking branch 'origin/maint-0.2.5' into release-0.2.5
-rw-r--r--doc/tor.1.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 04d13fbfbc..8d51f6e3c2 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1493,6 +1493,11 @@ is non-zero):
public (external) IP address. See RFC 1918 and RFC 3330 for more details
about internal and reserved IP address space. +
+
+ Tor also allow IPv6 exit policy entries. For instance, "reject6 [FC00::]/7:*"
+ rejects all destinations that share 7 most significant bit prefix with
+ address FC00::. Respectively, "accept6 [C000::]/3:*" accepts all destinations
+ that share 3 most significant bit prefix with address C000::. +
+ +
This directive can be specified multiple times so you don't have to put it
all on one line. +
+