[or-cvs] Generalize FirewallPorts to FirewallIPs so I can run happil...

[nickm@xxxxxxxx (Nick Mathewson)]

Update of /home/or/cvsroot/tor/doc
In directory moria:/tmp/cvs-serv17792/doc

Modified Files:
	TODO tor.1.in 
Log Message:
Generalize FirewallPorts to FirewallIPs so I can run happily when locked in net 18.

Index: TODO
===================================================================
RCS file: /home/or/cvsroot/tor/doc/TODO,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -d -r1.338 -r1.339
--- TODO	5 Aug 2005 01:40:10 -0000	1.338
+++ TODO	7 Aug 2005 21:24:00 -0000	1.339
@@ -106,7 +106,7 @@
     o Document
     . Test, debug
     - On sighup, if usehelpernodes changed to 1, use new circs.
-N - Make a FirewallIPs to correspond to firewallPorts so I can use Tor at
+  o Make a FirewallIPs to correspond to firewallPorts so I can use Tor at
     MIT when my directory is out of date.
   - switch accountingmax to count total in+out, not either in or
     out. it's easy to move in this direction (not risky), but hard to

Index: tor.1.in
===================================================================
RCS file: /home/or/cvsroot/tor/doc/tor.1.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -d -r1.95 -r1.96
--- tor.1.in	7 Aug 2005 20:04:17 -0000	1.95
+++ tor.1.in	7 Aug 2005 21:24:00 -0000	1.96
@@ -240,6 +240,14 @@
 \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.
+.LP
+.TP
 \fBLongLivedPorts \fR\fIPORTS\fP
 A list of ports for services that tend to have long-running connections
 (e.g. chat and interactive shells). Circuits for streams that use these