nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.3.4' into maint-0.3.5

Browse Source
This commit is contained in:
Nick Mathewson 2018-12-01 11:15:09 -05:00
commit e82023d2f7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug28554 Normal file
View File

@ -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.

5
src/test/test_entrynodes.c
View File

@ -2832,13 +2832,16 @@ test_entry_guard_outdated_dirserver_exclusion(void *arg)
digests, 3, 7, 0); digests, 3, 7, 0);
/* ... and check that because we failed to fetch microdescs from all our /* ... 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."); expect_log_msg_containing("No primary or confirmed guards available.");
teardown_capture_of_logs(); teardown_capture_of_logs();
} }
done: done:
UNMOCK(networkstatus_get_latest_consensus_by_flavor);
UNMOCK(directory_initiate_request);
smartlist_free(digests); smartlist_free(digests);
tor_free(mock_ns_val);
tor_free(args); tor_free(args);
if (conn) { if (conn) {
tor_free(conn->requested_resource); tor_free(conn->requested_resource);