diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:59:58 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-02-03 13:59:58 -0500 |
| commit | e94ee583d6f81f2375ea9126e77495aeb3ca18bf (patch) | |
| tree | f444303fa981304b8f0d6cd9fe85bc704897c9ca | |
| parent | 2fa9ddb9580fc0d69967c54f16825f14658fd9b9 (diff) | |
| parent | f2bb7b17d7453a14d2be931f3e21c51f623443e4 (diff) | |
| download | tor-e94ee583d6f81f2375ea9126e77495aeb3ca18bf.tar tor-e94ee583d6f81f2375ea9126e77495aeb3ca18bf.tar.gz | |
Merge remote branch 'sebastian/bug2450' into maint-0.2.2
| -rw-r--r-- | changes/bug2450 | 5 | ||||
| -rw-r--r-- | doc/tor.1.txt | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug2450 b/changes/bug2450 new file mode 100644 index 000000000..b3b50ddb0 --- /dev/null +++ b/changes/bug2450 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Country codes aren't supported in EntryNodes until 0.2.3.x. + Don't mention them in the manpage. Fixes bug 2450, issue + spotted by keb and G-Lo. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 8fe73b026..6c9636caf 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -471,7 +471,7 @@ The following options are useful only for clients (that is, if list. **EntryNodes** __node__,__node__,__...__:: - A list of identity fingerprints, nicknames, country codes and address + A list of identity fingerprints, nicknames and address patterns of nodes to use for the first hop in normal circuits. These are treated only as preferences unless StrictNodes (see below) is also set. |