aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-05-15 11:22:06 -0400
committerNick Mathewson <nickm@torproject.org>2012-05-15 11:22:06 -0400
commit8e07798284faba6cc2492ca98e50f2e8bcb70934 (patch)
tree1e302bccd9b68aa0530d859623dc1d8df219ae01
parent5905a0b2dbcff8bd07e179750f53a8f010b4a5e0 (diff)
downloadtor-8e07798284faba6cc2492ca98e50f2e8bcb70934.tar.gz
tor-8e07798284faba6cc2492ca98e50f2e8bcb70934.zip
Clarify MaxCircuitDirtiness behavior with hidden services. Bug 5259.
-rw-r--r--changes/bug52593
-rw-r--r--doc/tor.1.txt5
2 files changed, 6 insertions, 2 deletions
diff --git a/changes/bug5259 b/changes/bug5259
new file mode 100644
index 0000000000..bdada586e9
--- /dev/null
+++ b/changes/bug5259
@@ -0,0 +1,3 @@
+ o Documentation fixes:
+ - Clarify the behavior of MaxCircuitDirtiness with hidden service
+ circuits. Fix for issue 5259.
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 25a440d1bb..5f10f68712 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -651,8 +651,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)
**NodeFamily** __node__,__node__,__...__::
The Tor servers, defined by their identity fingerprints or nicknames,