commit ba94dc28e8e96a64420d42b97ba38e715a35e74c Merge: da82e0b57 ea13a4779 68c21860e Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 21 12:37:46 2017 -0500

Merge branches 'bug24099_031' and 'bug24086_031' into maint-0.3.2

changes/bug24086 | 7 +++++++ changes/bug24099 | 4 ++++ src/common/storagedir.c | 25 +++++++++++++++++++++---- src/or/conscache.c | 17 ++++++++++++++--- src/or/consdiffmgr.c | 13 +++++++++++-- 5 files changed, 57 insertions(+), 9 deletions(-)