summaryrefslogtreecommitdiff
path: root/src/or/circuituse.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2010-08-13 20:50:51 -0400
committerRoger Dingledine <arma@torproject.org>2010-08-13 20:50:51 -0400
commite50857b67f23d06671d2856a04879c3425747adf (patch)
treefd2513ef65a9db54882d61ee985633fd16b03214 /src/or/circuituse.c
parent5b0c0e1f89b020f4fc50fa1b50edbb17fa776fe4 (diff)
downloadtor-e50857b67f23d06671d2856a04879c3425747adf.tar.gz
tor-e50857b67f23d06671d2856a04879c3425747adf.zip
changes entry for bug 1741
Diffstat (limited to 'src/or/circuituse.c')
-rw-r--r--src/or/circuituse.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 65ecb5433c..0429ca9cc9 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -748,7 +748,8 @@ circuit_expire_old_circuits_clientside(time_t now)
} else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) {
/* Server side rend joined circuits can end up really old, because
* they are reused by clients for longer than normal. The client
- * controls their lifespan. */
+ * controls their lifespan. (They never become dirty, because
+ * connection_exit_begin_conn() never marks anything as dirty.) */
if (circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) {
log_notice(LD_CIRC,
"Ancient non-dirty circuit %d is still around after "
@@ -756,6 +757,8 @@ circuit_expire_old_circuits_clientside(time_t now)
TO_ORIGIN_CIRCUIT(circ)->global_identifier,
(long)(now - circ->timestamp_created),
circ->purpose);
+ /* FFFF implement a new circuit_purpose_to_string() so we don't
+ * just print out a number for circ->purpose */
TO_ORIGIN_CIRCUIT(circ)->is_ancient = 1;
}
}