aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 0000000000..b3b50ddb01
--- /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 8fe73b026b..6c9636caf7 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.