commit ec7ffed79da3f84d4bff7b92434f872dd228102c Author: Nick Mathewson nickm@torproject.org Date: Wed Jan 30 10:19:41 2013 -0500

Document the ?? country code. --- doc/tor.1.txt | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3b13a61..9473221 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -679,7 +679,11 @@ The following options are useful only for clients (that is, if Note also that if you are a relay, this (and the other node selection options below) only affects your own circuits that Tor builds for you. Clients can still build circuits through you to any node. Controllers - can tell Tor to build circuits through any node. + can tell Tor to build circuits through any node. + + + + Country codes are case-insensitive. The code "{??}" refers to nodes whose + country can't be identified. No country code, including {??}, works if + no GeoIPFile can be loaded. See also the GeoIPExcludeUnknown option below.

**ExcludeExitNodes** __node__,__node__,__...__:: @@ -691,8 +695,8 @@ The following options are useful only for clients (that is, if

**GeoIPExcludeUnknown** **0**|**1**|**auto**:: If this option is set to 'auto', then whenever any country code is set in - ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country (?? and - possibly A1) are treated as excluded as well. If this option is set to + ExcludeNodes or ExcludeEntryNodes, all nodes with unknown country ({??} and + possibly {A1}) are treated as excluded as well. If this option is set to '1', then all unknown countries are treated as excluded in ExcludeNodes and ExcludeEntryNodes. This option has no effect when a GeoIP file isn't configured or can't be found. (Default: auto)