commit f527a809b3adbb1379465f2c5c7238502c2f3877 Merge: 8a163e9 19a9872 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 20 19:29:03 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 src/or/fallback_dirs.inc | 46 ++++++++++++++++++++++++++++++---------------- 1 file changed, 30 insertions(+), 16 deletions(-)