[or-cvs] [tor/master] Merge branch 'bug2279' into maint-0.2.2

[nickm at torproject.org]

commit 98cef0ac1e94fbcf7d1f9f70e077f22624033ecc
Merge: e9803aa e854e01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 7 12:43:54 2011 -0500

    Merge branch 'bug2279' into maint-0.2.2

 changes/bug2279           |   15 +++++++++++++++
 doc/spec/control-spec.txt |    6 +++++-
 doc/tor.1.txt             |   12 ++++++++++--
 src/or/config.c           |    2 ++
 src/or/connection.c       |    5 ++++-
 src/or/connection_edge.c  |   22 ++++++++++++++++++++++
 src/or/or.h               |   11 +++++++++++
 src/or/reasons.c          |    5 +++++
 8 files changed, 74 insertions(+), 4 deletions(-)

diff --combined doc/tor.1.txt
index 6c9636c,8909d82..3e92ef6
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -471,7 -471,7 +471,7 @@@ The following options are useful only f
      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.
  
@@@ -654,8 -654,9 +654,9 @@@
      can leak your location to attackers. (Default: 1)
  
  **VirtualAddrNetwork** __Address__/__bits__::
-     When a controller asks for a virtual (unused) address with the MAPADDRESS
-     command, Tor picks an unassigned address from this range. (Default:
+     When Tor needs to assign a virtual (unused) address because of a MAPADDRESS
+     command from the controller or the AutpmapHostsOnResolve feature, Tor
+     picks an unassigned address from this range. (Default:
      127.192.0.0/10) +
   +
      When providing proxy server service to a network of computers using a tool
@@@ -731,6 -732,12 +732,12 @@@
      192.168.0.1). This option prevents certain browser-based attacks; don't
      turn it off unless you know what you're doing. (Default: 1).
  
+ **ClientRejectInternalAddresses** **0**|**1**::
+     If true, Tor does not try to fulfill requests to connect to an internal
+     address (like 127.0.0.1 or 192.168.0.1) __unless a exit node is
+     specifically requested__ (for example, via a .exit hostname, or a
+     controller request).  (Default: 1).
+ 
  **DownloadExtraInfo** **0**|**1**::
      If true, Tor downloads and caches "extra-info" documents. These documents
      contain information about servers other than the information in their
@@@ -900,9 -907,7 +907,9 @@@ is non-zero)
      period, or receive more than that number in the period. For example, with
      AccountingMax set to 1 GB, a server could send 900 MB and receive 800 MB
      and continue running. It will only hibernate once one of the two reaches 1
 -    GB. When the number of bytes is exhausted, Tor will hibernate until some
 +    GB. When the number of bytes gets low, Tor will stop accepting new
 +    connections and circuits.  When the number of bytes
 +    is exhausted, Tor will hibernate until some
      time in the next accounting period. To prevent all servers from waking at
      the same time, Tor will also wait until a random point in each period
      before waking up. If you have bandwidth cost issues, enabling hibernation
@@@ -1269,6 -1274,7 +1276,7 @@@ The following options are used for runn
         AuthDirMaxServersPerAddr 0
         AuthDirMaxServersPerAuthAddr 0
         ClientDNSRejectInternalAddresses 0
+        ClientRejectInternalAddresses 0
         ExitPolicyRejectPrivate 0
         V3AuthVotingInterval 5 minutes
         V3AuthVoteDelay 20 seconds