commit 78c610eea9472348634e05b49f9d3a9f4dcc221c Merge: 8b686d9 247cbab Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 27 15:20:01 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts: doc/tor.1.txt

changes/microdesc-double-free | 7 +++++++ doc/tor.1.txt | 12 +++++++----- src/or/routerparse.c | 1 + 3 files changed, 15 insertions(+), 5 deletions(-)

diff --cc doc/tor.1.txt index f24eaba,04a0537..8599fdc --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@@ -529,8 -511,9 +529,8 @@@ The following options are useful only f patterns of nodes to never use when picking an exit node---that is, a node that delivers traffic for you outside the Tor network. Note that any node listed in ExcludeNodes is automatically considered to be part of this - list too. See also the caveats on the "ExitNodes" option below + list too. See also the caveats on the "ExitNodes" option below.

- **ExitNodes** __node__,__node__,__...__:: A list of identity fingerprints, nicknames, country codes and address patterns of nodes to use as exit node---that is, a @@@ -550,12 -534,13 +551,13 @@@ The ExcludeNodes option overrides this option: any node listed in both ExitNodes and ExcludeNodes is treated as excluded. + + - The .exit address notation, if enabled, overrides this option. + The .exit address notation, if enabled via AllowDotExit, overrides + this option.

**EntryNodes** __node__,__node__,__...__:: - A list of identity fingerprints and nicknames of nodes - to use for the first hop in your normal circuits. (Country codes and - address patterns are not yet supported.) Normal circuits include all + A list of identity fingerprints, nicknames, and country codes of nodes + to use for the first hop in your normal circuits. - This includes all ++ Normal circuits include all circuits except for direct connections to directory servers. The Bridge option overrides this option; if you have configured bridges and UseBridges is 1, the Bridges are used as your entry nodes. +