commit e3ab27001f81dc05eb1dd1ac8371a35ccce2b50d Merge: a1ce1ab20 b85fa0bd5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.3.0' into maint-0.3.1

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