From: Nick Mathewson <nickm@torproject.org>
Date: Sun, 21 Mar 2004 05:01:06 +0000 (+0000)
Subject: Dont expire circuits we didnt originate.  This may be redundant somehow, but better... 
X-Git-Tag: tor-0.0.3~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3f6b55ea11e548c4febcaf946e7d66ee8b9b7ee;p=thirdparty%2Ftor.git

Dont expire circuits we didnt originate.  This may be redundant somehow, but better safe than sorry.


svn:r1331
---

diff --git a/src/or/circuit.c b/src/or/circuit.c
index c4f51e79a4..225c8e37cb 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