diff options
author | Nick Mathewson <nickm@torproject.org> | 2008-09-25 20:21:35 +0000 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2008-09-25 20:21:35 +0000 |
commit | 8bbbbaf87b5ab3c0a5918d2bc8d1d7f22cf54f53 (patch) | |
tree | 9c9019d25cbba426218b1fd95560226e4e127cf1 /doc/tor.1.in | |
parent | b2c7090da6e0d01322d6f1590c46ca03e47f6e26 (diff) | |
download | tor-8bbbbaf87b5ab3c0a5918d2bc8d1d7f22cf54f53.tar.gz tor-8bbbbaf87b5ab3c0a5918d2bc8d1d7f22cf54f53.zip |
Add country-code support to configured node lists to implement the ever-popular "no exits in Monaco" feature (ExcludeExitNodes {MC}). Also allow country codes and IP ranges in ExitNodes. (EntryNodes needs more work.) Based on code by Robert Hogan. Needs more testing.
svn:r16966
Diffstat (limited to 'doc/tor.1.in')
-rw-r--r-- | doc/tor.1.in | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/doc/tor.1.in b/doc/tor.1.in index 90eb9dd9f6..48f5b00b22 100644 --- a/doc/tor.1.in +++ b/doc/tor.1.in @@ -422,28 +422,28 @@ you are reliable and high-bandwidth enough to be a useful server.) .LP .TP \fBExcludeNodes \fR\fInode\fR,\fInode\fR,\fI...\fP -A list of identity fingerprints, nicknames, and address patterns of -nodes to never use when building a circuit. (Example: ExcludeNodes -SlowServer, $ABCDEFFFFFFFFFFFFFFF, 255.254.0.0/8) +A list of identity fingerprints, nicknames, country codes and address patterns +of nodes to never use when building a circuit. (Example: ExcludeNodes +SlowServer, $ABCDEFFFFFFFFFFFFFFF, {cc}, 255.254.0.0/8) .LP .TP \fBExcludeExitNodes \fR\fInode\fR,\fInode\fR,\fI...\fP -A list of identity fingerprints, nicknames, and address patterns of -nodes to never use when picking an exit node. Note that any node +A list of identity fingerprints, nicknames, country codes and address patterns +of nodes to never use when picking an exit node. Note that any node listed in ExcludeNodes is automatically considered to be part of this list. .LP .TP \fBEntryNodes \fR\fInode\fR,\fInode\fR,\fI...\fP -A list of identity fingerprints or nicknames of preferred nodes to use for the -first hop in the circuit. +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 below) is also set. .LP .TP \fBExitNodes \fR\fInode\fR,\fInode\fR,\fI...\fP -A list of identity fingerprints or nicknames of preferred nodes to use for the -last hop in the circuit. +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 below) is also set. .LP |