aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2011-01-28 14:15:01 +0100
committerSebastian Hahn <sebastian@torproject.org>2011-01-28 14:19:28 +0100
commitf2bb7b17d7453a14d2be931f3e21c51f623443e4 (patch)
treee03c4c2f02103e3b8494d5a462f36b32f68fceb6
parente6da9a98e9697d8d9ad9ef4ea224b09be1f6ce13 (diff)
downloadtor-f2bb7b17d7453a14d2be931f3e21c51f623443e4.tar
tor-f2bb7b17d7453a14d2be931f3e21c51f623443e4.tar.gz
Remove country codes from EntryNodes manpage entry
-rw-r--r--changes/bug24505
-rw-r--r--doc/tor.1.txt2
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.