diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-08-14 04:22:08 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-08-14 04:22:08 -0400 |
| commit | a207d9db4ccf3c7430f0b9fe97959be6fe4912be (patch) | |
| tree | 4b7d009558167a42cc123453654ac8c7ed534dbf | |
| parent | e50857b67f23d06671d2856a04879c3425747adf (diff) | |
| download | tor-a207d9db4ccf3c7430f0b9fe97959be6fe4912be.tar.gz tor-a207d9db4ccf3c7430f0b9fe97959be6fe4912be.zip | |
fix another piece of 1741
| -rw-r--r-- | src/or/circuituse.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 0429ca9cc9..e9335b18d6 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -746,11 +746,13 @@ circuit_expire_old_circuits_clientside(time_t now) (long)(now - circ->timestamp_created)); circuit_mark_for_close(circ, END_CIRC_REASON_FINISHED); } else if (!TO_ORIGIN_CIRCUIT(circ)->is_ancient) { - /* Server side rend joined circuits can end up really old, because + /* 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. (They never become dirty, because - * connection_exit_begin_conn() never marks anything as dirty.) */ - if (circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) { + * connection_exit_begin_conn() never marks anything as dirty.) + * Similarly, server-side intro circuits last a long time. */ + if (circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED && + circ->purpose != CIRCUIT_PURPOSE_S_INTRO) { log_notice(LD_CIRC, "Ancient non-dirty circuit %d is still around after " "%ld seconds. Purpose: %d", |