commit 6fc47062affef5653eae59dbe220f86da81f57ff Merge: eb078a3bd 361014255 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 14 07:57:14 2017 -0400

Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1

changes/bug23077 | 4 +++ src/test/test_channelpadding.c | 56 +++++++++++++++++++++++++++++++++++------- 2 files changed, 51 insertions(+), 9 deletions(-)

diff --cc src/test/test_channelpadding.c index 1c6107a87,bdc61d329..1e9d59931 --- a/src/test/test_channelpadding.c +++ b/src/test/test_channelpadding.c @@@ -708,11 -559,15 +720,12 @@@ test_channelpadding_consensus(void *arg tt_i64_op(val, OP_LE, 24*60*60*2);

done: + free_mock_consensus(); free_fake_channeltls((channel_tls_t*)chan); smartlist_free(connection_array); - smartlist_free(current_md_consensus->routerstatus_list); - smartlist_free(current_ns_consensus->net_params); - tor_free(relay); - tor_free(current_ns_consensus);

timers_shutdown(); + monotime_disable_test_mocking(); channel_free_all();

return;