sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.2' into release-0.2.2

This commit is contained in:
Roger Dingledine 2011-10-25 19:34:20 -04:00
parent ee2efc5c82 ac115f1125
commit e76f626ff6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug4309 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes:
- Remove a confusing dollar sign from the example fingerprint in the
man page, and also make example fingerprint a valid one. Fixes bug
4309; bugfix on 0.2.1.3-alpha.

2
doc/tor.1.txt
View File

@ -509,7 +509,7 @@ The following options are useful only for clients (that is, if
A list of identity fingerprints, nicknames, country codes and address
patterns of nodes to avoid when building a circuit.
(Example:
ExcludeNodes SlowServer, $ EFFFFFFFFFFFFFFF, \{cc}, 255.254.0.0/8) +
ExcludeNodes SlowServer, ABCD1234CDEF5678ABCD1234CDEF5678ABCD1234, \{cc}, 255.254.0.0/8) +
+
By default, this option is treated as a preference that Tor is allowed
to override in order to keep working.