diff options
author | Nick Mathewson <nickm@torproject.org> | 2014-04-01 09:39:48 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2014-04-01 09:39:48 -0400 |
commit | 6bef082d0a6047fd3625f548d60ad257aaed2fab (patch) | |
tree | 6a3431ce250f4a6a9704523f8cdbde17975dd90d /src/test | |
parent | c0441cca8b483882f5676b98081f0fe4b52d3ae1 (diff) | |
parent | 61090bb64f03d5fd944535311191486d22b3134d (diff) | |
download | tor-6bef082d0a6047fd3625f548d60ad257aaed2fab.tar.gz tor-6bef082d0a6047fd3625f548d60ad257aaed2fab.zip |
Merge remote-tracking branch 'public/bug11232'
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/test_circuitlist.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/test_circuitlist.c b/src/test/test_circuitlist.c index 720b407659..54aa51d3c7 100644 --- a/src/test/test_circuitlist.c +++ b/src/test/test_circuitlist.c @@ -150,13 +150,13 @@ test_clist_maps(void *arg) tt_assert(! circuit_id_in_use_on_channel(100, ch1)); done: - tor_free(ch1); - tor_free(ch2); - tor_free(ch3); if (or_c1) circuit_free(TO_CIRCUIT(or_c1)); if (or_c2) circuit_free(TO_CIRCUIT(or_c2)); + tor_free(ch1); + tor_free(ch2); + tor_free(ch3); UNMOCK(circuitmux_attach_circuit); UNMOCK(circuitmux_detach_circuit); } |