diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-10-25 19:34:42 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-10-25 19:34:42 -0400 |
| commit | a518dd66506e44c1318c44777187dc82c275329e (patch) | |
| tree | b6dffa356ef316c571c7e3b6f30c3fdcd9cb87e2 | |
| parent | aa3c70922002b1fbb8fa5e60fbfe0c25d2d1abae (diff) | |
| parent | ac115f112543c58828a9d049b78a491ff430af10 (diff) | |
| download | tor-a518dd66506e44c1318c44777187dc82c275329e.tar.gz tor-a518dd66506e44c1318c44777187dc82c275329e.zip | |
Merge branch 'maint-0.2.2'
| -rw-r--r-- | changes/bug4309 | 5 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug4309 b/changes/bug4309 new file mode 100644 index 0000000000..f4f910e7ff --- /dev/null +++ b/changes/bug4309 @@ -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. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0ef61cb7dd..89dd7dc638 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -527,7 +527,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. |