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

changes/bug5259

@@ -0,0 +1,3 @@
+  o Documentation fixes:
+    - Clarify the behavior of MaxCircuitDirtiness with hidden service
+      circuits. Fix for issue 5259.

doc/tor.1.txt

@@ -781,8 +781,9 @@ The following options are useful only for clients (that is, if
 
 **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