nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'sebastian/bug2450' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-02-03 13:59:58 -05:00
commit e94ee583d6
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/bug2450 Normal file
View File

@ -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.

2
doc/tor.1.txt
View File

@ -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.