Browse Source

doc patches submitted by jason holt

svn:r909
Roger Dingledine 20 years ago
parent
commit
325935b1c6
3 changed files with 11 additions and 3 deletions
  1. 3 0
      AUTHORS
  2. 5 2
      README
  3. 3 1
      doc/tor.1.in

+ 3 - 0
AUTHORS

@@ -21,3 +21,6 @@ the tor.sh initscripts shell script.
 Steven Hazel <sah@thalassocracy.org> made 'make install' do the right
 Steven Hazel <sah@thalassocracy.org> made 'make install' do the right
 thing.
 thing.
 
 
+Jason Holt <jason@lunkwill.org> contributed patches to the instructions
+and the man page.
+

+ 5 - 2
README

@@ -24,8 +24,11 @@ Do you want to run a tor server?
 
 
   Then run tor to generate keys. One of the files generated
   Then run tor to generate keys. One of the files generated
   in your DataDirectory is your 'fingerprint' file. Mail it to
   in your DataDirectory is your 'fingerprint' file. Mail it to
-  arma@mit.edu. Remember that you won't be able to authenticate to the
-  other tor nodes until I've added you to the directory.
+  arma@mit.edu.
+
+  NOTE: You won't be able to use tor as a client or server
+  in this configuration until you've been added to the directory
+  and can authenticate to the other nodes.
 
 
 Configuring tsocks:
 Configuring tsocks:
 
 

+ 3 - 1
doc/tor.1.in

@@ -83,7 +83,9 @@ The fqdn of this server (e.g. moria.mit.edu).
 Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
 Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
 .TP
 .TP
 \fBexitpolicy \fR\fIpolicy,policy,...\fP
 \fBexitpolicy \fR\fIpolicy,policy,...\fP
-Set an exit policy for this server. Each policy is of the form "reject 127.0.0.1:*". Also handles masks and bits.
+Set an exit policy for this server. Each policy is of the form "reject ADDR/MASK:PORT".  For exam
+ple, "reject 127.0.0.1:*,reject 192.168.1.0/24:*,accept *:*" would reject any traffic destined fo
+r localhost and any 192.168.1.* address, but accept anything else.
 .TP
 .TP
 \fBmaxonionspending \fR\fINUM\fP
 \fBmaxonionspending \fR\fINUM\fP
 If you have more than this number of onionskins queued for decrypt, reject new ones. (Default: 100)
 If you have more than this number of onionskins queued for decrypt, reject new ones. (Default: 100)