summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-03-28 20:09:22 -0400
committerNick Mathewson <nickm@torproject.org>2016-03-28 20:09:22 -0400
commit90c24c0ced62a36c3100e49ad404b3519ba1cd77 (patch)
treefa3500088c3b29bff47d8f37d77968896d691b10 /src
parent055a7a198a1517a6d1d37c4dac9ac8e925d7aa7d (diff)
parentba87f5bb25cd001ab8560f23a88e60a504c7059a (diff)
downloadtor-90c24c0ced62a36c3100e49ad404b3519ba1cd77.tar.gz
tor-90c24c0ced62a36c3100e49ad404b3519ba1cd77.zip
Merge branch 'maint-0.2.8'
Diffstat (limited to 'src')
-rw-r--r--src/or/circuitlist.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 670c5b3c19..1efb7ef4d0 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -760,7 +760,7 @@ or_circuit_new(circid_t p_circ_id, channel_t *p_chan)
void
circuit_clear_testing_cell_stats(circuit_t *circ)
{
- if (!circ)
+ if (!circ || !circ->testing_cell_stats)
return;
SMARTLIST_FOREACH(circ->testing_cell_stats, testing_cell_stats_entry_t *,
ent, tor_free(ent));