From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 15 Dec 2015 17:19:08 +0000 (-0500)
Subject: Merge branch 'feature17576-UseDefaultFallbackDirs-v2-squashed'
X-Git-Tag: tor-0.2.8.1-alpha~143
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54433993c7c84dc9af878ebaf8dd1deae8c595e3;p=thirdparty%2Ftor.git

Merge branch 'feature17576-UseDefaultFallbackDirs-v2-squashed'
---

54433993c7c84dc9af878ebaf8dd1deae8c595e3