Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2011-12-06 13:38:40 -05:00
commit 748a0d2794

View File

@ -1665,7 +1665,7 @@ static void
cnt_free(void *ptr) cnt_free(void *ptr)
{ {
allocated_chunks -= 1; allocated_chunks -= 1;
return free(ptr); free(ptr);
} }
struct testleak_env_t { struct testleak_env_t {