aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-03-21 05:01:06 +0000
committerNick Mathewson <nickm@torproject.org>2004-03-21 05:01:06 +0000
commitb3f6b55ea11e548c4febcaf946e7d66ee8b9b7ee (patch)
tree0925a72709a818abc1ff3981b5fee047588d386b /src/or
parent2561472809c39e68b0c2f614f47090eb9ae82b65 (diff)
downloadtor-b3f6b55ea11e548c4febcaf946e7d66ee8b9b7ee.tar
tor-b3f6b55ea11e548c4febcaf946e7d66ee8b9b7ee.tar.gz
Dont expire circuits we didnt originate. This may be redundant somehow, but better safe than sorry.
svn:r1331
Diffstat (limited to 'src/or')
-rw-r--r--src/or/circuit.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/circuit.c b/src/or/circuit.c
index c4f51e79a..225c8e37c 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -926,6 +926,7 @@ void circuit_expire_unused_circuits(void) {
if(((tmpcirc->timestamp_dirty &&
tmpcirc->timestamp_dirty + options.NewCircuitPeriod < now) ||
(options.RunTesting &&
+ tmpcirc->cpath &&
tmpcirc->timestamp_created + TESTING_CIRCUIT_MAX_AGE < now))
&& !tmpcirc->p_conn
&& !tmpcirc->p_streams