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

svn:r1331

diff --git a/src/or/circuit.c b/src/or/circuit.c
index c4f51e79a47d03864a4c9dbcadb53d3109b991e6..225c8e37cb1794a21f9ae0629f044e0af0db09ff 100644 (file)
--- 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