commit 0fbe1a2c6f617e04d748ac333bf0dd28e28293c7 Merge: 6bc9ff8 af891e7 Author: Nick Mathewson nickm@torproject.org Date: Tue May 30 08:50:45 2017 -0400

Merge remote-tracking branch 'teor/bug22424'

changes/bug22424 | 5 +++++ src/common/storagedir.c | 53 +++++++++++++++++++++++++++++++++++-------------- 2 files changed, 43 insertions(+), 15 deletions(-)