commit 45d008c4aa2e5c689cad82a0a50f18ed4436a2c3 Merge: 877468c ee253e3 Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 16 16:03:13 2017 -0400

Merge branch 'storagedir_squashed'

changes/storagedir | 5 + src/common/include.am | 2 + src/common/storagedir.c | 406 +++++++++++++++++++++++++++++++++++++++++++++ src/common/storagedir.h | 37 +++++ src/test/include.am | 1 + src/test/test.c | 1 + src/test/test.h | 1 + src/test/test_storagedir.c | 270 ++++++++++++++++++++++++++++++ 8 files changed, 723 insertions(+)