aboutsummaryrefslogtreecommitdiff
path: root/doc/tor.1.in
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-06-09 09:03:12 +0000
committerRoger Dingledine <arma@torproject.org>2005-06-09 09:03:12 +0000
commite8a9a713e624d36040ee4448d49665df1f999263 (patch)
treed97e8a46e7325ff1ea412808df69e3e8a4441fa1 /doc/tor.1.in
parentf649ea51b45dd2f2b11bc5d12ecfd0c6d5142a36 (diff)
downloadtor-e8a9a713e624d36040ee4448d49665df1f999263.tar
tor-e8a9a713e624d36040ee4448d49665df1f999263.tar.gz
mention defaults for clientonly and nopublish
svn:r4369
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r--doc/tor.1.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in
index 95122d4e0..a0ef4dfed 100644
--- a/doc/tor.1.in
+++ b/doc/tor.1.in
@@ -170,7 +170,7 @@ you don't need to set this; Tor is pretty smart at figuring out whether
you are reliable and high-bandwidth enough to be a useful server.)
This option will likely be deprecated in the future; see the NoPublish
-option below.
+option below. (Default: 0)
.TP
\fBEntryNodes \fR\fInickname\fR,\fInickname\fR,\fI...\fP
A list of preferred nodes to use for the first hop in the circuit, if possible.
@@ -338,6 +338,7 @@ If you set NoPublish 1, Tor will act as a server if you have an ORPort
defined, but it will not publish its descriptor to the dirservers. This
option is useful if you're testing out your server, or if you're using
alternate dirservers (e.g. for other Tor networks such as Blossom).
+(Default: 0)
.TP
\fBNumCPUs \fR\fInum\fP
How many processes to use at once for decrypting onionskins. (Default: 1)