[or-cvs] [tor/master] Merge remote branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 0337fc7b06e0137d483b08a7969a7da708ea404b
Merge: c417210 e6da9a9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 26 11:49:41 2011 -0500

    Merge remote branch 'origin/maint-0.2.2'

 changes/bug2181    |    4 ++++
 doc/tor.1.txt      |    4 +++-
 src/or/hibernate.c |    6 ++++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --combined doc/tor.1.txt
index cfd5142,8fe73b0..65dc769
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -343,13 -343,6 +343,13 @@@ Other options can be specified either o
      on Windows; instead you should use the --service command-line option.
      (Default: 0)
  
 +**LogTimeGranularity** __NUM__::
 +    Set the resolution of timestamps in Tor's logs to NUM milliseconds.
 +    NUM must be positive and either a divisor or a multiple of 1 second.
 +    Note that this option only controls the granularity written by Tor to
 +    a file or console log.  Tor does not (for example) "batch up" log
 +    messages to affect times logged by a controller, times attached to
 +    syslog messages, or the mtime fields on log files.  (Default: 1 second)
  
  **SafeLogging** **0**|**1**|**relay**::
      Tor can scrub potentially sensitive strings from log messages (e.g.
@@@ -404,11 -397,6 +404,11 @@@
      networkstatus. This is an advanced option; you generally shouldn't have
      to mess with it. (Default: not set.)
  
 +**DisableIOCP** **0**|**1**::
 +    If Tor was built to use the Libevent's "bufferevents" networking code
 +    and you're running on Windows, setting this option to 1 will tell Libevent
 +    not to use the Windows IOCP networking API.  (Default: 1)
 +
  CLIENT OPTIONS
  --------------
  
@@@ -580,8 -568,7 +580,8 @@@ The following options are useful only f
      constitute a "family" of similar or co-administered servers, so never use
      any two of them in the same circuit. Defining a NodeFamily is only needed
      when a server doesn't list the family itself (with MyFamily). This option
 -    can be used multiple times.
 +    can be used multiple times.  In addition to nodes, you can also list
 +    IP address and ranges and country codes in {curly braces}.
  
  **EnforceDistinctSubnets** **0**|**1**::
      If 1, Tor will not put two servers whose IP addresses are "too close" on
@@@ -877,9 -864,7 +877,9 @@@ is non-zero)
      characters inclusive, and must contain only the characters [a-zA-Z0-9].
  
  **NumCPUs** __num__::
 -    How many processes to use at once for decrypting onionskins. (Default: 1)
 +    How many processes to use at once for decrypting onionskins and other
 +    parallelizable operations.  If this is set to 0, Tor will try to detect
 +    how many CPUs you have, defaulting to 1 if it can't tell.  (Default: 0)
  
  **ORPort** __PORT__::
      Advertise this port to listen for connections from Tor clients and servers.
@@@ -890,18 -875,6 +890,18 @@@
      specified in ORPort. (Default: 0.0.0.0) This directive can be specified
      multiple times to bind to multiple addresses/ports.
  
 +**PortForwarding** **0**|**1**::
 +    Attempt to automatically forward the DirPort and ORPort on a NAT router
 +    connecting this Tor server to the Internet. If set, Tor will try both
 +    NAT-PMP (common on Apple routers) and UPnP (common on routers from other
 +    manufacturers). (Default: 0)
 +
 +**PortForwardingHelper** __filename__|__pathname__::
 +    If PortForwarding is set, use this executable to configure the forwarding.
 +    If set to a filename, the system path will be searched for the executable.
 +    If set to a path, only the specified path will be executed.
 +    (Default: tor-fw-helper)
 +
  **PublishServerDescriptor** **0**|**1**|**v1**|**v2**|**v3**|**bridge**|**hidserv**,**...**::
      This option specifies which descriptors Tor will publish when acting as
      a relay or hidden service. You can
@@@ -927,7 -900,9 +927,9 @@@
      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
@@@ -1027,10 -1002,6 +1029,10 @@@
      When this option is enabled, Tor writes statistics on the number of relayed
      bytes and opened stream per exit port to disk every 24 hours. (Default: 0)
  
 +**ConnDirectionStatistics** **0**|**1**::
 +    When this option is enabled, Tor writes statistics on the bidirectional use
 +    of connections to disk every 24 hours. (Default: 0)
 +
  **ExtraInfoStatistics** **0**|**1**::
      When this option is enabled, Tor includes previously gathered statistics in
      its extra-info documents that it uploads to the directory authorities.