tor

commit e3a19b1c788ba303a41cab0dcba945af84041764
parent 36c32355349bff091b92c04be2823d96feebd5c6
Author: Nick Mathewson <nickm@torproject.org>
Date:   Sat,  1 Dec 2018 11:15:09 -0500

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
A
changes/bug28554
 | 
3
+++
M
src/test/test_entrynodes.c
 | 
5
++++-

2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/changes/bug28554 b/changes/bug28554
@@ -0,0 +1,3 @@
+  o Minor bugfixes (unit tests, guard selection):
+    - Stop leaking memory in an entry guard unit test. Fixes bug 28554;
+      bugfix on 0.3.0.1-alpha.
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
@@ -2819,13 +2819,16 @@ test_entry_guard_outdated_dirserver_exclusion(void *arg)
                                   digests, 3, 7, 0);
 
     /* ... and check that because we failed to fetch microdescs from all our
-     * primaries, we didnt end up selecting a primary for fetching dir info */
+     * primaries, we didn't end up selecting a primary for fetching dir info */
     expect_log_msg_containing("No primary or confirmed guards available.");
     teardown_capture_of_logs();
   }
 
  done:
+  UNMOCK(networkstatus_get_latest_consensus_by_flavor);
+  UNMOCK(directory_initiate_request);
   smartlist_free(digests);
+  tor_free(mock_ns_val);
   tor_free(args);
   if (conn) {
     tor_free(conn->requested_resource);