summaryrefslogtreecommitdiff
path: root/src/or/circuitlist.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-06-14 12:25:33 -0400
committerNick Mathewson <nickm@torproject.org>2011-06-14 12:25:33 -0400
commit8839b86085dbb9ccf26165b6eae4d09462bc88b6 (patch)
tree4572f6b0c38136b3d631c8878b7108213627960e /src/or/circuitlist.c
parent910dadd6eab5b2b3af3b655f52b861085f379b84 (diff)
parent54d7d31cba84232b50fef4287951b2c4bfa746c2 (diff)
downloadtor-8839b86085dbb9ccf26165b6eae4d09462bc88b6.tar.gz
tor-8839b86085dbb9ccf26165b6eae4d09462bc88b6.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/circuitlist.c')
-rw-r--r--src/or/circuitlist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index f1f0cb2a63..91fb13faf7 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -773,8 +773,8 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn)
return found->circuit;
return NULL;
-
/* The rest of this checks for bugs. Disabled by default. */
+ /* We comment it out because coverity complains otherwise.
{
circuit_t *circ;
for (circ=global_circuitlist;circ;circ = circ->next) {
@@ -793,7 +793,7 @@ circuit_get_by_circid_orconn_impl(circid_t circ_id, or_connection_t *conn)
}
}
return NULL;
- }
+ } */
}
/** Return a circ such that: