[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit 517032b8ce14ac2f468e0fba66da43212c00a02e
Merge: b1ab360ec ba94dc28e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Nov 21 12:41:39 2017 -0500

    Merge branch '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(-)