diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-12-21 04:38:49 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-12-21 04:38:49 -0500 |
| commit | 937607056b53bbb3d6c94b57d930e144de8e7c8c (patch) | |
| tree | d14bcb611aeccb80ce8b00bbd7656fa956bab11f /doc | |
| parent | 22e07b4ead93914708b4579aa1241f7f4f4121a2 (diff) | |
| download | tor-937607056b53bbb3d6c94b57d930e144de8e7c8c.tar.gz tor-937607056b53bbb3d6c94b57d930e144de8e7c8c.zip | |
a changelog and doc fixes for the strictnodes work
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/tor.1.in | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index 8a34b63f21..b08e670352 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -515,26 +515,25 @@ list. .TP \fBEntryNodes \fR\fInode\fR,\fInode\fR,\fI...\fP A list of identity fingerprints, nicknames, country codes and address patterns -of nodes to use for the first hop in the circuit. -These are treated only as preferences unless StrictEntryNodes (see +of nodes to use for the first hop in normal circuits. +These are treated only as preferences unless StrictNodes (see below) is also set. .LP .TP \fBExitNodes \fR\fInode\fR,\fInode\fR,\fI...\fP A list of identity fingerprints, nicknames, country codes and address patterns -of nodes to use for the last hop in the circuit. -These are treated only as preferences unless StrictExitNodes (see +of nodes to use for the last hop in normal exit circuits. +These are treated only as preferences unless StrictNodes (see below) is also set. .LP .TP -\fBStrictEntryNodes \fR\fB0\fR|\fB1\fR\fP -If 1, Tor will never use any nodes besides those listed in "EntryNodes" for -the first hop of a circuit. -.LP -.TP -\fBStrictExitNodes \fR\fB0\fR|\fB1\fR\fP -If 1, Tor will never use any nodes besides those listed in "ExitNodes" for -the last hop of a circuit. +\fBStrictNodes \fR\fB0\fR|\fB1\fR\fP +If 1 and EntryNodes config option is set, Tor will never use any +nodes besides those listed in EntryNodes for the first hop of a normal +circuit. If 1 and ExitNodes config option is set, Tor will never use any +nodes besides those listed in ExitNodes for the last hop of a normal exit +circuit. Note that Tor might still use these nodes for non-exit circuits +such as one-hop directory fetches or hidden service support circuits. .LP .TP \fBFascistFirewall \fR\fB0\fR|\fB1\fR\fP |