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

diff --cc src/test/test_channelpadding.c
index 1c6107a872644d50304a2a532c841a309dfecae8,bdc61d329df6e1d3683c97dc987a5d82373fb91a..1e9d5993182a8791b02a1e684a34474803daad06
--- 1/src/test/test_channelpadding.c
--- 2/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;