Update tor-manual.html to 0.1.0.10
Thomas Sjögren

Thomas Sjögren commited on 2005-06-30 01:02:35
Zeige 1 geänderte Dateien mit 181 Einfügungen und 93 Löschungen.

... ...
@@ -4,7 +4,7 @@ Content-type: text/html
4 4
 <HTML><HEAD><TITLE>Man page of TOR</TITLE>
5 5
 </HEAD><BODY>
6 6
 <H1>TOR</H1>
7
-Section: User Commands  (1)<BR>Updated: November 2004<BR><A HREF="#index">Index</A>
7
+Section: User Commands  (1)<BR>Updated: May 2005<BR><A HREF="#index">Index</A>
8 8
 <A HREF="../">Return to Main Contents</A><HR>
9 9
 
10 10
 <A NAME="lbAB">&nbsp;</A>
... ...
@@ -45,24 +45,42 @@ FILE contains further &quot;option value&quot; pairs. (Default: @CONFDIR@/torrc)
45 45
 <DT>Other options can be specified either on the command-line (<I>--option<DD>
46 46
 value</I>), or in the configuration file (<I>option value</I>).
47 47
 Options are case-insensitive.
48
-<DT><B>Log </B><I>minSeverity</I>[-<I>maxSeverity</I>] <B>stderr</B>|<B>stdout</B>|<B>syslog</B><DD>
49
-Send all messages between <I>minSeverity</I> and <I>maxSeverity</I> to
50
-the standard output stream, the standard error stream, or to the system
51
-log. (The &quot;syslog&quot; value is only supported on Unix.)  Recognized
52
-severity levels are debug, info, notice, warn, and err.  If only one
53
-severity level is given, all messages of that level or higher will be
54
-sent to the listed destination.
55
-<DT><B>Log </B><I>minSeverity</I>[-<I>maxSeverity</I>] <B>file</B> <I>FILENAME</I><DD>
56
-As above, but send log messages to the listed filename.  The &quot;Log&quot;
57
-option may appear more than once in a configuration file.  Messages
58
-are sent to all the logs that match their severity level.
59 48
 <DT><B>BandwidthRate </B><I>N</I> <B>bytes</B>|<B>KB</B>|<B>MB</B>|<B>GB</B>|<B>TB</B><DD>
60 49
 A token bucket limits the average incoming bandwidth on this node to
61
-the specified number of bytes per second. (Default: 780 KB)
50
+the specified number of bytes per second. (Default: 2 MB)
62 51
 <DT><B>BandwidthBurst </B><I>N</I> <B>bytes</B>|<B>KB</B>|<B>MB</B>|<B>GB</B>|<B>TB</B><DD>
63
-Limit the maximum token bucket size (also known as the burst) to the given number of bytes. (Default: 48 MB)
52
+Limit the maximum token bucket size (also known as the burst) to the given number of bytes. (Default: 5 MB)
53
+<DT><B>MaxAdvertisedBandwidth </B><I>N</I> <B>bytes</B>|<B>KB</B>|<B>MB</B>|<B>GB</B>|<B>TB</B><DD>
54
+If set, we will not advertise more than this amount of bandwidth for our
55
+BandwidthRate. Server operators who want to reduce the number of clients
56
+who ask to build circuits through them (since this is proportional to
57
+advertised bandwidth rate) can thus reduce the CPU demands on their
58
+server without impacting network performance.
59
+<DT><B>ControlPort </B><I>Port</I><DD>
60
+If set, Tor will accept connections from the same machine (localhost only) on
61
+this port, and allow those connections to control the Tor process using the
62
+Tor Control Protocol (described in control-spec.txt).  Note: unless you also
63
+specify one of <B>HashedControlPassword</B> or <B>CookieAuthentication</B>,
64
+setting this option will cause Tor to allow any process on the local host to
65
+control it.
66
+<DT><B>HashedControlPassword </B><I>hashed_password</I><DD>
67
+Don't allow any connections on the control port except when the other process
68
+knows the password whose one-way hash is <I>hashed_password</I>.  You can
69
+compute the hash of a password by running &quot;tor --hash-password
70
+<I>password</I>&quot;.
71
+<DT><B>CookieAuthentication </B><B>0</B>|<B>1</B><DD>
72
+If this option is set to 1, don't allow any connections on the control port
73
+except when the connecting process knows the contents of a file named
74
+&quot;control_auth_cookie&quot;, which Tor will create in its data directory.  This
75
+authentication methods should only be used on systems with good filesystem
76
+security. (Default: 0)
64 77
 <DT><B>DataDirectory </B><I>DIR</I><DD>
65 78
 Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor)
79
+<DT><B>DirFetchPeriod </B><I>N</I> <B>seconds</B>|<B>minutes</B>|<B>hours</B>|<B>days</B>|<B>weeks</B><DD>
80
+Every time the specified period elapses, Tor downloads a directory.
81
+A directory contains a signed list of all known servers as well as
82
+their current liveness status. A value of &quot;0 seconds&quot; tells Tor to choose an
83
+appropriate default. (Default: 1 hour for clients, 20 minutes for servers)
66 84
 <DT><B>DirServer </B><I>address:port fingerprint</I><DD>
67 85
 Use a nonstandard authoritative directory server at the provided
68 86
 address and port, with the specified key fingerprint.  This option can
... ...
@@ -72,11 +90,44 @@ directory servers: moria1, moria2, and tor26.
72 90
 <DT><B>Group </B><I>GID</I><DD>
73 91
 On startup, setgid to this user.
74 92
 <DT><B>HttpProxy</B> <I>host</I>[:<I>port</I>]<DD>
75
-If set, Tor will make all its directory requests through this host:port,
93
+Tor will make all its directory requests through this host:port
94
+(or host:80 if port is not specified),
76 95
 rather than connecting directly to any directory servers.
96
+<DT><B>HttpProxyAuthenticator</B> <I>username:password</I><DD>
97
+If defined, Tor will use this username:password for Basic Http proxy
98
+authentication, as in RFC 2617. This is currently the only form of
99
+Http proxy authentication that Tor supports; feel free to submit a
100
+patch if you want it to support others.
101
+<DT><B>HttpsProxy</B> <I>host</I>[:<I>port</I>]<DD>
102
+Tor will make all its OR (SSL) connections through this host:port
103
+(or host:443 if port is not specified), via HTTP CONNECT rather than
104
+connecting directly to servers.  You may want to set <B>FascistFirewall</B>
105
+to restrict the set of ports you might try to connect to, if your Https
106
+proxy only allows connecting to certain ports.
107
+<DT><B>HttpsProxyAuthenticator</B> <I>username:password</I><DD>
108
+If defined, Tor will use this username:password for Basic Https proxy
109
+authentication, as in RFC 2617. This is currently the only form of
110
+Https proxy authentication that Tor supports; feel free to submit a
111
+patch if you want it to support others.
77 112
 <DT><B>KeepalivePeriod </B><I>NUM</I><DD>
78 113
 To keep firewalls from expiring connections, send a padding keepalive
79
-cell on open connections every NUM seconds. (Default: 5 minutes.)
114
+cell every NUM seconds on open connections that are in use. If the
115
+connection has no open circuits, it will instead be closed after NUM
116
+seconds of idleness. (Default: 5 minutes)
117
+<DT><B>Log </B><I>minSeverity</I>[-<I>maxSeverity</I>] <B>stderr</B>|<B>stdout</B>|<B>syslog</B><DD>
118
+Send all messages between <I>minSeverity</I> and <I>maxSeverity</I> to
119
+the standard output stream, the standard error stream, or to the system
120
+log. (The &quot;syslog&quot; value is only supported on Unix.)  Recognized
121
+severity levels are debug, info, notice, warn, and err.  If only one
122
+severity level is given, all messages of that level or higher will be
123
+sent to the listed destination.
124
+<DT><B>Log </B><I>minSeverity</I>[-<I>maxSeverity</I>] <B>file</B> <I>FILENAME</I><DD>
125
+As above, but send log messages to the listed filename.  The &quot;Log&quot;
126
+option may appear more than once in a configuration file.  Messages
127
+are sent to all the logs that match their severity level.
128
+<DT><B>MaxConn </B><I>NUM</I><DD>
129
+Maximum number of simultaneous sockets allowed.  You probably don't need
130
+to adjust this. (Default: 1024)
80 131
 <DT><B>OutboundBindAddress </B><I>IP</I><DD>
81 132
 Make all outbound connections originate from the IP address specified.  This
82 133
 is only useful when you have multiple network interfaces, and you want all
... ...
@@ -85,37 +136,18 @@ of Tor's outgoing connections to use a single one.
85 136
 On startup, write our PID to FILE. On clean shutdown, remove FILE.
86 137
 <DT><B>RunAsDaemon </B><B>0</B>|<B>1</B><DD>
87 138
 If 1, Tor forks and daemonizes to the background. (Default: 0)
88
-<DT><B>User </B><I>UID</I><DD>
89
-On startup, setuid to this user.
90
-<DT><B>ControlPort </B><I>Port</I><DD>
91
-If set, Tor will accept connections from the same machine (localhost only) on
92
-this port, and allow those connections to control the Tor process using the
93
-Tor Control Protocol (described in control-spec.txt).  Note: unless you also
94
-specify one of <B>HashedControlPassword</B> or <B>CookieAuthentication</B>,
95
-setting this option will cause Tor to allow any process on the local host to
96
-control it.
97
-<DT><B>HashedControlPassword </B><I>hashed_password</I><DD>
98
-Don't allow any connections on the control port except when the other process
99
-knows the password whose one-way hash is <I>hashed_password</I>.  You can
100
-compute the hash of a password by running &quot;tor --hash-password
101
-<I>password</I>&quot;.
102
-<DT><B>CookieAuthentication </B><B>0</B>|<B>1</B><DD>
103
-If this option is set to 1, don't allow any connections on the control port
104
-except when the connecting process knows the contents of a file named
105
-&quot;control_auth_cookie&quot;, which Tor will create in its data directory.  This
106
-authentication methods should only be used on systems with good filesystem
107
-security.
108
-<B>DirFetchPeriod </B><I>N</I> <B>seconds</B>|<B>minutes</B>|<B>hours</B>|<B>days</B>|<B>weeks</B>
109
-Every time the specified period elapses, Tor downloads a directory.
110
-A directory contains a signed list of all known servers as well as
111
-their current liveness status.  (Default: 1 hour)
139
+<DT><B>SafeLogging </B><B>0</B>|<B>1</B><DD>
140
+If 1, Tor replaces potentially sensitive strings in the logs
141
+(e.g. addresses) with the string [scrubbed]. This way logs can still be
142
+useful, but they don't leave behind personally identifying information
143
+about what sites a user might have visited. (Default: 1)
112 144
 <DT><B>StatusFetchPeriod </B><I>N</I> <B>seconds</B>|<B>minutes</B>|<B>hours</B>|<B>days</B>|<B>weeks</B><DD>
113 145
 Every time the specified period elapses, Tor downloads signed status
114
-information about the current state of known servers.  (Default: 20 minutes.)
115
-<DT><B>RendPostPeriod </B><I>N</I> <B>seconds</B>|<B>minutes</B>|<B>hours</B>|<B>days</B>|<B>weeks</B><DD>
116
-Every time the specified period elapses, Tor uploads any rendezvous
117
-service descriptors to the directory servers.  This information is also
118
-uploaded whenever it changes.  (Default: 20 minutes.)
146
+information about the current state of known servers.  A value of
147
+&quot;0 seconds&quot; tells Tor to choose an appropriate default. (Default: 30
148
+minutes for clients, 15 minutes for servers)
149
+<DT><B>User </B><I>UID</I><DD>
150
+On startup, setuid to this user.
119 151
 <P>
120 152
 </DL>
121 153
 <A NAME="lbAF">&nbsp;</A>
... ...
@@ -127,11 +159,15 @@ The following options are useful only for clients (that is, if <B>SOCKSPort</B>
127 159
 <DL COMPACT>
128 160
 <DT><B>AllowUnverifiedNodes</B> <B>entry</B>|<B>exit</B>|<B>middle</B>|<B>introduction</B>|<B>rendezvous</B>|...<DD>
129 161
 Where on our circuits should we allow Tor servers that the directory
130
-servers haven't authenticated as &quot;verified&quot;?  (Default: middle,rendezvous.)
162
+servers haven't authenticated as &quot;verified&quot;?  (Default: middle,rendezvous)
131 163
 <DT><B>ClientOnly </B><B>0</B>|<B>1</B><DD>
132
-If set to 1, Tor will under no circumstances run as a server.  (Usually,
164
+If set to 1, Tor will under no circumstances run as a server. The default
165
+is to run as a client unless ORPort is configured.  (Usually,
133 166
 you don't need to set this; Tor is pretty smart at figuring out whether
134
-you are reliable and high-bandwidth enough to be a good server.)
167
+you are reliable and high-bandwidth enough to be a useful server.)
168
+<P>
169
+This option will likely be deprecated in the future; see the NoPublish
170
+option below. (Default: 0)
135 171
 <DT><B>EntryNodes </B><I>nickname</I>,<I>nickname</I>,<I>...</I><DD>
136 172
 A list of preferred nodes to use for the first hop in the circuit, if possible.
137 173
 <DT><B>ExitNodes </B><I>nickname</I>,<I>nickname</I>,<I>...</I><DD>
... ...
@@ -151,10 +187,23 @@ allow you to run Tor as a client behind a firewall with restrictive policies,
151 187
 but will not allow you to run as a server behind such a firewall.
152 188
 <DT><B>FirewallPorts </B><I>PORTS</I><DD>
153 189
 A list of ports that your firewall allows you to connect to.  Only used when
154
-<B>FascistFirewall</B> is set. (Default: 80, 443.)
155
-<DT><B><DD>
156
-NewCircuitPeriod </B><I>NUM</I>
157
-Every NUM seconds consider whether to build a new circuit. (Default: 60)
190
+<B>FascistFirewall</B> is set. (Default: 80, 443)
191
+<DT><B>LongLivedPorts </B><I>PORTS</I><DD>
192
+A list of ports for services that tend to have long-running connections
193
+(e.g. chat and interactive shells). Circuits for streams that use these
194
+ports will contain only high-uptime nodes, to reduce the chance that a
195
+node will go down before the stream is finished. (Default: 21, 22, 706, 1863, 5050, 
196
+5190, 5222, 5223, 6667, 8300, 8888)
197
+<DT><B>MapAddress</B> <I>address</I> <I>newaddress</I><DD>
198
+When a request for address arrives to Tor, it will rewrite it to newaddress before 
199
+processing it. For example, if you always want connections to <A HREF="http://www.indymedia.org">www.indymedia.org</A> to 
200
+exit via <I>torserver</I> (where <I>torserver</I> is the nickname of the server), 
201
+use &quot;MapAddress <A HREF="http://www.indymedia.org">www.indymedia.org</A> <A HREF="http://www.indymedia.org.torserver.exit">www.indymedia.org.torserver.exit</A>&quot;.
202
+<DT><B>NewCircuitPeriod </B><I>NUM</I><DD>
203
+Every NUM seconds consider whether to build a new circuit. (Default: 30 seconds)
204
+<DT><B>MaxCircuitDirtiness </B><I>NUM</I><DD>
205
+Feel free to reuse a circuit that was first used at most NUM seconds
206
+ago, but never attach a new stream to a circuit that is too old. (Default: 10 minutes)
158 207
 <DT><B>NodeFamily </B><I>nickname</I>,<I>nickname</I>,<I>...</I><DD>
159 208
 The named Tor servers constitute a &quot;family&quot; of similar or co-administered
160 209
 servers, so never use any two of them in the same circuit. Defining a
... ...
@@ -169,13 +219,32 @@ A list of preferred nodes to use for the rendezvous point, if possible.
169 219
 <DT><B>RendExcludeNodes </B><I>nickname</I>,<I>nickname</I>,<I>...</I><DD>
170 220
 A list of nodes to never use when choosing a rendezvous point.
171 221
 <DT><B>SOCKSPort </B><I>PORT</I><DD>
172
-Bind to this port to listen for connections from SOCKS-speaking applications.
173
-Set this to 0 if you don't want to allow application connections. (Default:
174
-9050)
175
-<DT><B>SOCKSBindAddress </B><I>IP</I><DD>
176
-Bind to this address to listen for connections from socks-speaking applications. (Default: 127.0.0.1) You can also specify a port (e.g. 192.168.0.1:9100). This directive can be specified multiple times to bind to multiple addresses/ports.
222
+Advertise this port to listen for connections from SOCKS-speaking
223
+applications.  Set this to 0 if you don't want to allow application
224
+connections. (Default: 9050)
225
+<DT><B>SOCKSBindAddress </B><I>IP</I>[:<I>PORT</I>]<DD>
226
+Bind to this address to listen for connections from SOCKS-speaking
227
+applications. (Default: 127.0.0.1) You can also specify a port
228
+(e.g. 192.168.0.1:9100). This directive can be specified multiple times
229
+to bind to multiple addresses/ports.
177 230
 <DT><B>SOCKSPolicy </B><I>policy</I>,<I>policy</I>,<I>...</I><DD>
178
-Set an entrance policy for this server, to limit who can connect to the socks ports. The policies have the same form as exit policies below.
231
+Set an entrance policy for this server, to limit who can connect to the SOCKS ports. 
232
+The policies have the same form as exit policies below.
233
+<DT><B>TrackHostExits </B><I>host</I>,<I>.domain</I>,<I>...</I><DD>
234
+For each value in the comma separated list, Tor will track recent connections
235
+to hosts that match this value and attempt to
236
+reuse the same exit node for each. If the value is prepended with a '.', it is
237
+treated as matching an entire domain. If one of the values is just a '.', it
238
+means match everything. This option is useful if you frequently connect to
239
+sites that will expire all your authentication cookies (ie log you out) if
240
+your IP address changes. Note that this option does have the disadvantage of
241
+making it more clear that a given history is
242
+associated with a single user. However, most people who would wish to observe
243
+this will observe it through cookies or other protocol-specific means anyhow.
244
+<DT><B>TrackHostExitsExpire </B><I>NUM</I><DD>
245
+Since exit servers go up and down, it is desirable to expire the association
246
+between host and exit server after NUM seconds of inactivity. The default
247
+is 1800 seconds (30 minutes).
179 248
 <P>
180 249
 </DL>
181 250
 <A NAME="lbAG">&nbsp;</A>
... ...
@@ -192,11 +261,12 @@ unset, and Tor will guess your IP.
192 261
 Administrative contact information for server.
193 262
 <DT><B>ExitPolicy </B><I>policy</I>,<I>policy</I>,<I>...</I><DD>
194 263
 Set an exit policy for this server. Each policy is of the form
195
-&quot;<B>accept</B>|<B>reject</B> <I>ADDR</I>[<B>/</B><I>MASK</I>]<B>:</B><I>PORT</I>&quot;.
264
+&quot;<B>accept</B>|<B>reject</B> <I>ADDR</I>[<B>/</B><I>MASK</I>]<B>[:</B><I>PORT</I>]&quot;.
196 265
 If <B>/</B><I>MASK</I> is omitted then this policy just applies to the host
197 266
 given.  Instead of giving a host or network you can also use &quot;<B>*</B>&quot; to
198 267
 denote the universe (0.0.0.0/0).  <I>PORT</I> can be a single port number,
199 268
 an interval of ports &quot;<I>FROM_PORT</I><B>-</B><I>TO_PORT</I>&quot;, or &quot;<B>*</B>&quot;.
269
+If PORT is omitted, that means &quot;<B>*</B>&quot;.
200 270
 <P>
201 271
 For example, &quot;reject 127.0.0.1:*,reject 192.168.1.0/24:*,accept *:*&quot; would
202 272
 reject any traffic destined for localhost and any 192.168.1.* address, but
... ...
@@ -219,22 +289,16 @@ either a reject *:* or an accept *:*. Otherwise, you're _augmenting_
219 289
 <DT>reject 192.168.0.0/16<DD>
220 290
 <DT>reject 10.0.0.0/8<DD>
221 291
 <DT>reject 172.16.0.0/12<DD>
222
-<DT>accept *:20-22<DD>
223
-<DT>accept *:53<DD>
224
-<DT>accept *:79-81<DD>
225
-<DT>accept *:110<DD>
226
-<DT>accept *:143<DD>
227
-<DT>accept *:443<DD>
228
-<DT>accept *:706<DD>
229
-<DT>accept *:873<DD>
230
-<DT>accept *:993<DD>
231
-<DT>accept *:995<DD>
292
+<DT>reject *:25<DD>
293
+<DT>reject *:119<DD>
294
+<DT>reject *:135-139<DD>
295
+<DT>reject *:445<DD>
232 296
 <DT>reject *:1214<DD>
233 297
 <DT>reject *:4661-4666<DD>
234 298
 <DT>reject *:6346-6429<DD>
299
+<DT>reject *:6699<DD>
235 300
 <DT>reject *:6881-6999<DD>
236
-<DT>accept *:1024-65535<DD>
237
-<DT>reject *:*<DD>
301
+<DT>accept *:*<DD>
238 302
 </DL>
239 303
 </DL>
240 304
 
... ...
@@ -245,16 +309,24 @@ If you have more than this number of onionskins queued for decrypt, reject new o
245 309
 Declare that this Tor server is controlled or administered by a group
246 310
 or organization identical or similar to that of the other named servers.
247 311
 When two servers both declare that they are in the same 'family', Tor clients
248
-will not use them in the same circuit.  (Each server only need to list the
249
-other servers in its family; it doesn't need to list itself.)
312
+will not use them in the same circuit.  (Each server only needs to list the
313
+other servers in its family; it doesn't need to list itself, but it won't hurt.)
250 314
 <DT><B>Nickname </B><I>name</I><DD>
251 315
 Set the server's nickname to 'name'.
316
+<DT><B>NoPublish </B><B>0</B>|<B>1</B><DD>
317
+If you set NoPublish 1, Tor will act as a server if you have an ORPort
318
+defined, but it will not publish its descriptor to the dirservers. This
319
+option is useful if you're testing out your server, or if you're using
320
+alternate dirservers (e.g. for other Tor networks such as Blossom).
321
+(Default: 0)
252 322
 <DT><B>NumCPUs </B><I>num</I><DD>
253 323
 How many processes to use at once for decrypting onionskins. (Default: 1)
254 324
 <DT><B>ORPort </B><I>PORT</I><DD>
255
-Bind to this port to listen for connections from Tor clients and servers.
256
-<DT><B>ORBindAddress </B><I>IP</I><DD>
257
-Bind to this address to listen for connections from Tor clients and servers. (Default: 0.0.0.0)
325
+Advertise this port to listen for connections from Tor clients and servers.
326
+<DT><B>ORBindAddress </B><I>IP</I>[:<I>PORT</I>]<DD>
327
+Bind to this IP address to listen for connections from Tor clients and
328
+servers. If you specify a port, bind to this port rather than the one
329
+specified in ORPort. (Default: 0.0.0.0)
258 330
 <DT><B>RedirectExit </B><I>pattern target</I><DD>
259 331
 Whenever an outgoing connection tries to connect to one of a given set
260 332
 of addresses, connect to <I>target</I> (an <I>address:port</I> pair) instead.
... ...
@@ -266,18 +338,26 @@ successfully, no subsequent rules are considered.  You can specify that no
266 338
 redirection is to be performed on a given set of addresses by using the
267 339
 special target string &quot;pass&quot;, which prevents subsequent rules from being
268 340
 considered.
341
+<DT><B>ShutdownWaitLength</B><I>NUM</I><DD>
342
+When we get a SIGINT and we're a server, we begin shutting down: we close
343
+listeners and start refusing new circuits. After <B>NUM</B> seconds,
344
+we exit. If we get a second SIGINT, we exit immediately.  (Default:
345
+30 seconds)
269 346
 <DT><B>DirPostPeriod </B><I>N</I> <B>seconds</B>|<B>minutes</B>|<B>hours</B>|<B>days</B>|<B>weeks</B><DD>
270 347
 Every time the specified period elapses, Tor uploads its server
271 348
 descriptors to the directory servers.  This information is also
272
-uploaded whenever it changes.  (Default: 20 minutes.)
349
+uploaded whenever it changes.  (Default: 20 minutes)
273 350
 <DT><B>AccountingMax </B><I>N</I> <B>bytes</B>|<B>KB</B>|<B>MB</B>|<B>GB</B>|<B>TB</B><DD>
274 351
 Never send more than the specified number of bytes in a given
275 352
 accounting period, or receive more than that number in the period.
353
+For example, with AccountingMax set to 1 GB, a server could send 900 MB
354
+and receive 800 MB and continue running. It will only hibernate once one
355
+of the two reaches 1 GB.
276 356
 When the number of bytes is exhausted, Tor will hibernate until some
277 357
 time in the next accounting period.  To prevent all servers from
278 358
 waking at the same time, Tor will also wait until a random point in
279 359
 each period before waking up.  If you have bandwidth cost issues,
280
-using this option is preferable to setting a low bandwidth, since it
360
+enabling hibernation is preferable to setting a low bandwidth, since it
281 361
 provides users with a collection of fast servers that are up some of
282 362
 the time, which is more useful than a set of slow servers that are
283 363
 always &quot;available&quot;.
... ...
@@ -309,17 +389,23 @@ Unless the clients already have you listed as a trusted directory, you
309 389
 probably do not want to set this option.  Please coordinate with the other
310 390
 admins at <A HREF="mailto:tor-ops@freehaven.net">tor-ops@freehaven.net</A> if you think you should be a directory.
311 391
 <DT><B>DirPort </B><I>PORT</I><DD>
312
-Bind the directory service to this port.
313
-<DT><B>DirBindAddress </B><I>IP</I><DD>
314
-Bind the directory service to this address. (Default: 0.0.0.0)
392
+Advertise the directory service on this port.
393
+<DT><B>DirBindAddress </B><I>IP</I>[:<I>PORT</I>]<DD>
394
+Bind the directory service to this address. If you specify a port, bind
395
+to this port rather than the one specified in DirPort. (Default: 0.0.0.0)
315 396
 <DT><B>DirPolicy </B><I>policy</I>,<I>policy</I>,<I>...</I><DD>
316
-Set an entrance policy for this server, to limit who can connect to the directory ports. The policies have the same form as exit policies above.
397
+Set an entrance policy for this server, to limit who can connect to the directory ports. 
398
+The policies have the same form as exit policies above.
317 399
 <DT><B>RecommendedVersions </B><I>STRING</I><DD>
318 400
 STRING is a command-separated list of Tor versions currently believed
319 401
 to be safe. The list is included in each directory, and nodes which
320 402
 pull down the directory learn whether they need to upgrade.  This
321 403
 option can appear multiple times: the values from multiple lines are
322 404
 spliced together.
405
+<DT><B>DirAllowPrivateAddresses </B><B>0</B>|<B>1</B><DD>
406
+If set to 1, Tor will accept router descriptors with arbitrary &quot;Address&quot;
407
+elements. Otherwise, if the address is not an IP or is a private IP,
408
+it will reject the router descriptor. Defaults to 0.
323 409
 <DT><B>RunTesting </B><B>0</B>|<B>1</B><DD>
324 410
 If set to 1, Tor tries to build circuits through all of the servers it
325 411
 knows about, so it can tell which are up and which are down.  This
... ...
@@ -346,10 +432,15 @@ same port on 127.0.0.1.  You may override the target port, address, or both
346 432
 by specifying a target of addr, port, or addr:port.
347 433
 <DT><B>HiddenServiceNodes </B><I>nickname</I>,<I>nickname</I>,<I>...</I><DD>
348 434
 If possible, use the specified nodes as introduction points for the hidden
349
-service.
435
+service. If this is left unset, Tor will be smart and pick some reasonable
436
+ones; most people can leave this unset.
350 437
 <DT><B>HiddenServiceExcludeNodes </B><I>nickname</I>,<I>nickname</I>,<I>...</I><DD>
351 438
 Do not use the specified nodes as introduction points for the hidden
352
-service.
439
+service. In normal use there is no reason to set this.
440
+<DT><B>RendPostPeriod </B><I>N</I> <B>seconds</B>|<B>minutes</B>|<B>hours</B>|<B>days</B>|<B>weeks</B><DD>
441
+Every time the specified period elapses, Tor uploads any rendezvous
442
+service descriptors to the directory servers.  This information is also
443
+uploaded whenever it changes.  (Default: 20 minutes)
353 444
 <P>
354 445
 
355 446
 
... ...
@@ -365,9 +456,11 @@ Tor will catch this, clean up and sync to disk if necessary, and exit.
365 456
 <DT><B>SIGINT</B><DD>
366 457
 Tor clients behave as with SIGTERM; but Tor servers will do a controlled
367 458
 slow shutdown, closing listeners and waiting 30 seconds before exiting.
459
+(The delay can be configured with the ShutdownWaitLength config option.)
368 460
 <DT><B>SIGHUP</B><DD>
369
-The signal instructs Tor to reload its configuration, fetch a new
370
-directory, and kill and restart its helper processes if applicable.
461
+The signal instructs Tor to reload its configuration (including closing
462
+and reopening logs), fetch a new directory, and kill and restart its
463
+helper processes if applicable.
371 464
 <DT><B>SIGUSR1</B><DD>
372 465
 Log statistics about current connections, past connections, and
373 466
 throughput.
... ...
@@ -391,10 +484,6 @@ If this signal exists on your platform, Tor catches and ignores it.
391 484
 
392 485
 <DD>
393 486
 The configuration file, which contains &quot;option value&quot; pairs.
394
-<DT><I>@CONFDIR@/dirservers</I>
395
-
396
-<DD>
397
-A list of directory servers, to bootstrap into the network.
398 487
 <DT><I>@LOCALSTATEDIR@/lib/tor/</I>
399 488
 
400 489
 <DD>
... ...
@@ -411,13 +500,13 @@ The tor process stores keys and other data here.
411 500
 <B><A HREF="../?1+torify">torify</A></B>(1)
412 501
 
413 502
 <P>
414
-<B><A HREF="http://tor.eff.org">http://tor.eff.org</A></B>
503
+<B><A HREF="http://tor.eff.org/">http://tor.eff.org/</A></B>
415 504
 
416 505
 <P>
417 506
 <A NAME="lbAM">&nbsp;</A>
418 507
 <H2>BUGS</H2>
419 508
 
420
-Plenty, probably. It's still in alpha. Please report them.
509
+Plenty, probably. Tor is still in development. Please report them.
421 510
 <A NAME="lbAN">&nbsp;</A>
422 511
 <H2>AUTHORS</H2>
423 512
 
... ...
@@ -445,6 +534,6 @@ Roger Dingledine &lt;<A HREF="mailto:arma@mit.edu">arma@mit.edu</A>&gt;, Nick Ma
445 534
 This document was created by
446 535
 <A HREF="../">man2html</A>,
447 536
 using the manual pages.<BR>
448
-Time: 13:07:23 GMT, May 19, 2005
537
+Time: 23:00:41 GMT, June 29, 2005
449 538
 </BODY>
450 539
 </HTML>
451 540