[tor-commits] [tor/release-0.4.1] Merge branch 'maint-0.2.9' into maint-0.3.5

[nickm at torproject.org]

commit 1dd95278970f9f32d83a31fe73e0258a30523539
Merge: b0fa1f4fb fb977f8ca
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 1 14:25:12 2019 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.5

 changes/ticket28795              |   5 +
 src/app/config/fallback_dirs.inc | 567 ++++++++++++++++++---------------------
 2 files changed, 266 insertions(+), 306 deletions(-)