summaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2005-08-08 21:58:48 +0000
committerNick Mathewson <nickm@torproject.org>2005-08-08 21:58:48 +0000
commit249b72f53e59beaefbc7b71ac0051c8afc110573 (patch)
tree83809229418cb686ef349f56371f26396988495e /doc/tor.1.in
parent3ac34ae3293ceb0f2b8c49c41b450f4923353871 (diff)
downloadtor-249b72f53e59beaefbc7b71ac0051c8afc110573.tar.gz
tor-249b72f53e59beaefbc7b71ac0051c8afc110573.zip
Replace (Fascist)Firewall* with a new ReachableAddresses option that understands address policies.
svn:r4751
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in26
1 files changed, 16 insertions, 10 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index d6bf9c82d0..107a78f3d7 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -233,19 +233,25 @@ If 1, Tor will only create outgoing connections to ORs running on ports that
your firewall allows (defaults to 80 and 443; see \fBFirewallPorts\fR). This will
allow you to run Tor as a client behind a firewall with restrictive policies,
but will not allow you to run as a server behind such a firewall.
+This option is deprecated; use
+ReachableAddresses instead.
.LP
.TP
\fBFirewallPorts \fR\fIPORTS\fP
-A list of ports that your firewall allows you to connect to. Only used when
-\fBFascistFirewall\fR is set. (Default: 80, 443)
-.LP
-.TP
-\fBFirewallIPs \fR\fIADDR\fP[\fB/\fP\fIMASK\fP\fB][:\fP\fIPORT\fP]...\fP
-A comma-separated list of IPs that your firewall allows you to connect to.
-Only used when \fBFascistFirewall\fR is set. The format is as for the
-addresses in ExitPolicy. For example, 'FirewallIPs 99.0.0.0/8, *:80' means
-that your firewall allows connections to everything inside net 99, and to
-port 80 outside.
+A list of ports that your firewall allows you to connect to. Only
+used when \fBFascistFirewall\fR is set. This option is deprecated; use
+ReachableAddresses instead. (Default: 80, 443)
+.LP
+.TP
+\fBReachableAddresses \fR\fIADDR\fP[\fB/\fP\fIMASK\fP\fB][:\fP\fIPORT\fP]...\fP
+A comma-separated list of IPs that your firewall allows you to connect
+to. Only used when \fBFascistFirewall\fR is set. The format is as
+for the addresses in ExitPolicy, except that "accept" is understood
+unless "reject" is explicitly provided. For example, 'FirewallIPs
+99.0.0.0/8, reject 18.0.0.0/8:80, accept *:80' means that your
+firewall allows connections to everything inside net 99, rejects port
+80 connections to net 18, and accepts connections to port 80 otherwise.
+(Default: 'accept *:*'.)
.LP
.TP
\fBLongLivedPorts \fR\fIPORTS\fP