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

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

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.