[tor-commits] [tor/maint-0.2.4] Bug 8477: Don't warn if fromerly GENERAL circuits still have streams.

[nickm at torproject.org]

commit f6a2f088fdd3b3ed3ccc355c98dde8da37b70a09
Author: Mike Perry <mikeperry-git at fscked.org>
Date:   Tue Mar 26 11:43:40 2013 -0700

    Bug 8477: Don't warn if fromerly GENERAL circuits still have streams.
    
    This can happen in various cases of network failure.
---
 src/or/connection_edge.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 9c39c25..5075c47 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.",