commit 01d988d72f9eae798a36d1c8bb226b9e8f4fe3f1 Merge: f1204e0 d68bbb0 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 23 09:22:16 2015 -0400

Merge remote-tracking branch 'teor/bug-15642-v3-fallback-unit-tests'

changes/bug-15642-default-fallback-default-dirs | 10 + src/or/config.c | 31 +- src/or/config.h | 6 + src/test/test_config.c | 1771 ++++++++++++++++++++++- 4 files changed, 1806 insertions(+), 12 deletions(-)