From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 14 Sep 2017 11:57:14 +0000 (-0400)
Subject: Merge remote-tracking branch 'mikeperry/bug23077' into maint-0.3.1
X-Git-Tag: tor-0.3.1.7~13^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6fc47062affef5653eae59dbe220f86da81f57ff;p=thirdparty%2Ftor.git

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

6fc47062affef5653eae59dbe220f86da81f57ff
diff --cc src/test/test_channelpadding.c
index 1c6107a872,bdc61d329d..1e9d599318
--- 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;