sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.3.1' into release-0.3.1

This commit is contained in:
Nick Mathewson 2017-08-08 19:29:10 -04:00
parent cbcff6759d a47b8fcf92
commit 47e7a167d2
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug23139 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes (directory cache):
- Fix a memory leak in the code that recovers space in the consensus
directory cache. Fixes bug 23139; bugfix on 0.3.1.1-alpha.

1
src/or/consdiffmgr.c
View File

@ -1156,6 +1156,7 @@ consdiffmgr_ensure_space_for_files(int n)
if (++n_marked >= n_to_remove)
break;
} SMARTLIST_FOREACH_END(ent);
smartlist_free(objects);
consensus_cache_delete_pending(cache, 1);
if (BUG(n_marked < n_to_remove))