commit 828333e38cd45c6af4931c7158b5d007fc2876e7 Merge: d2031f2c6 ea13a4779 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 11 16:48:44 2017 -0500

Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1

changes/bug24099 | 4 ++++ src/common/storagedir.c | 25 +++++++++++++++++++++---- src/or/conscache.c | 17 ++++++++++++++--- 3 files changed, 39 insertions(+), 7 deletions(-)