commit c6365055a1bf5a20cd17dd2b134ab7bfa2365ae3 Merge: b9be385fd ba94dc28e Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 21 12:41:39 2017 -0500

Merge branch 'maint-0.3.2' into release-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(-)