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

diff --cc doc/tor.1.txt
index 98c97e717ae936c21197d62fc3bd33e936b7e706,5f10f68712386d9ea5e0158afad0b6d1b14d5648..3dbaa3ab53ec4c54da085127cdaeba4f290688f0
--- 1/doc/tor.1.txt
--- 2/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@@ -781,14 -651,10 +781,15 @@@ The following options are useful only f
  
  **MaxCircuitDirtiness** __NUM__::
      Feel free to reuse a circuit that was first used at most NUM seconds ago,
-     but never attach a new stream to a circuit that is too old. (Default: 10
-     minutes)
+     but never attach a new stream to a circuit that is too old.  For hidden
+     services, this applies to the __last__ time a circuit was used, not the
+     first.  (Default: 10 minutes)
  
 +**MaxClientCircuitsPending** __NUM__::
 +    Do not allow more than NUM circuits to be pending at a time for handling
 +    client streams. A circuit is pending if we have begun constructing it,
 +    but it has not yet been completely constructed.  (Default: 32)
 +
  **NodeFamily** __node__,__node__,__...__::
      The Tor servers, defined by their identity fingerprints or nicknames,
      constitute a "family" of similar or co-administered servers, so never use