Merge branch 'maint-0.3.2' into release-0.3.2

This commit is contained in:
Nick Mathewson 2018-01-24 12:09:07 -05:00
commit 677bebda70
2 changed files with 5 additions and 0 deletions

4
changes/bug25005 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (unit tests):
- Fix a memory leak in the scheduler/loop_kist unit test. Fixes bug
25005; bugfix on 0.3.2.7-rc.

View File

@ -864,6 +864,7 @@ test_scheduler_loop_kist(void *arg)
tt_assert(ch3);
ch3->magic = TLS_CHAN_MAGIC;
ch3->state = CHANNEL_STATE_OPEN;
circuitmux_free(ch3->cmux);
ch3->cmux = circuitmux_alloc();
channel_register(ch3);
tt_assert(ch3->registered);