[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit 74ce41d4d4ca12a65813b18e7d6a1c61ee3cf14a
Merge: 2edad42fd f7b41bcdf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 11 16:50:48 2017 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

 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(-)