commit df54cfccee6cb5cbacc98a81c5940aaea88b34f7 Merge: 2626081e1 fb977f8ca Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jul 1 14:25:12 2019 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/ticket28795 | 5 + src/or/fallback_dirs.inc | 567 ++++++++++++++++++++++------------------------- 2 files changed, 266 insertions(+), 306 deletions(-)