[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit f9fe48989be0a770a36c9af935c73edfec031ba7
Merge: 0e5140320 e3ab27001
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 11:10:36 2018 -0500

    Merge branch 'maint-0.3.1' into release-0.3.1

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