commit e8fdac77552db29b0349bd823358fe8dd5209155 Merge: b650191b9 9464da210 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 717 insertions(+), 256 deletions(-)