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

Merge branch 'maint-0.2.9' into maint-0.3.0

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