summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-09-22 11:41:16 +1000
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2015-09-22 11:41:16 +1000
commit249e82c906bbab12ed7a1bdab7b89289fc6dcc1c (patch)
tree59b54d1d114170aeb7ee8bea42cc954249e10ff8 /doc
parentd27534eeb534d96a76487b3c0cd2cef4ff7cccc7 (diff)
downloadtor-249e82c906bbab12ed7a1bdab7b89289fc6dcc1c.tar.gz
tor-249e82c906bbab12ed7a1bdab7b89289fc6dcc1c.zip
Update docs with advice for separate IPv4 and IPv6 exit policies
Advise users how to configure separate IPv4 and IPv6 exit policies in the manpage and sample torrcs. Related to fixes in ticket #16069 and #17027. Patch by "teor". Patch on 2eb7eafc9d78 and a96c0affcb4c (25 Oct 2012), released in 0.2.4.7-alpha.
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt10
1 files changed, 7 insertions, 3 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 736cf75b51..38d0990e66 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1570,9 +1570,13 @@ is non-zero):
all on one line. +
+
Policies are considered first to last, and the first match wins. If you
- want to \_replace_ the default exit policy, end your exit policy with
- either a reject \*:* or an accept \*:*. Otherwise, you're \_augmenting_
- (prepending to) the default exit policy. The default exit policy is: +
+ want to allow the same ports on IPv4 and IPv6, write your rules using
+ accept/reject *. If you want to allow different ports on IPv4 and IPv6,
+ write your IPv6 rules using accept6/reject6 *6, and your IPv4 rules using
+ accept/reject *4. If you want to \_replace_ the default exit policy, end
+ your exit policy with either a reject \*:* or an accept \*:*. Otherwise,
+ you're \_augmenting_ (prepending to) the default exit policy. The default
+ exit policy is: +
reject *:25
reject *:119