diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2013-03-26 11:43:40 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-29 12:20:54 -0400 |
| commit | f6a2f088fdd3b3ed3ccc355c98dde8da37b70a09 (patch) | |
| tree | 1b0803fd70c749f1c2b14b568c5b8e34e915da06 /src/or | |
| parent | a7d6683629f499c73b3442bbc1d30b057161df11 (diff) | |
| download | tor-f6a2f088fdd3b3ed3ccc355c98dde8da37b70a09.tar.gz tor-f6a2f088fdd3b3ed3ccc355c98dde8da37b70a09.zip | |
Bug 8477: Don't warn if fromerly GENERAL circuits still have streams.
This can happen in various cases of network failure.
Diffstat (limited to 'src/or')
| -rw-r--r-- | 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 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.", |