Commit e3a19b1c authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge branch 'maint-0.3.3' into maint-0.3.4

parents 36c32355 ffc7b81b

changes/bug28554

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/test/test_entrynodes.c

+4 −1
Original line number Diff line number Diff line
@@ -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);