Merge branch 'maint-0.2.2' into release-0.2.2
This commit is contained in:
commit
e76f626ff6
|
@ -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.
|
||||||
|
|
|
@ -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
|
A list of identity fingerprints, nicknames, country codes and address
|
||||||
patterns of nodes to avoid when building a circuit.
|
patterns of nodes to avoid when building a circuit.
|
||||||
(Example:
|
(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
|
By default, this option is treated as a preference that Tor is allowed
|
||||||
to override in order to keep working.
|
to override in order to keep working.
|
||||||
|
|
Loading…
Reference in New Issue