From: Mike Perry <mikeperry-git@fscked.org>
Date: Tue, 26 Mar 2013 18:43:40 +0000 (-0700)
Subject: Bug 8477: Don't warn if fromerly GENERAL circuits still have streams.
X-Git-Tag: tor-0.2.4.12-alpha~5^2~7^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f6a2f088fdd3b3ed3ccc355c98dde8da37b70a09;p=thirdparty%2Ftor.git

Bug 8477: Don't warn if fromerly GENERAL circuits still have streams.

This can happen in various cases of network failure.
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 9c39c25219..5075c474a3 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -651,7 +651,9 @@ connection_ap_expire_beginning(void)
       }
       continue;
     }
-    if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL) {
+    if (circ->purpose != CIRCUIT_PURPOSE_C_GENERAL &&
+        circ->purpose != CIRCUIT_PURPOSE_C_MEASURE_TIMEOUT &&
+        circ->purpose != CIRCUIT_PURPOSE_PATH_BIAS_TESTING) {
       log_warn(LD_BUG, "circuit->purpose == CIRCUIT_PURPOSE_C_GENERAL failed. "
                "The purpose on the circuit was %s; it was in state %s, "
                "path_state %s.",