aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--AUTHORS3
-rw-r--r--README7
-rw-r--r--doc/tor.1.in4
3 files changed, 11 insertions, 3 deletions
diff --git a/AUTHORS b/AUTHORS
index 6c2b5d30f..3587c5328 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,3 +21,6 @@ the tor.sh initscripts shell script.
Steven Hazel <sah@thalassocracy.org> made 'make install' do the right
thing.
+Jason Holt <jason@lunkwill.org> contributed patches to the instructions
+and the man page.
+
diff --git a/README b/README
index bf594c132..99fa81aa1 100644
--- a/README
+++ b/README
@@ -24,8 +24,11 @@ Do you want to run a tor server?
Then run tor to generate keys. One of the files generated
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:
diff --git a/doc/tor.1.in b/doc/tor.1.in
index c9823df76..605f3cf14 100644
--- a/doc/tor.1.in
+++ b/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)
.TP
\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
\fBmaxonionspending \fR\fINUM\fP
If you have more than this number of onionskins queued for decrypt, reject new ones. (Default: 100)