commit 1c5c5f0e50084c7a36991212ddf21295306da17f Merge: 748ad2124 e3ab27001 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jan 8 11:10:36 2018 -0500 Merge branch 'maint-0.3.1' into maint-0.3.2 changes/ticket_24801 | 5 + src/or/fallback_dirs.inc | 968 ++++++++++++++++++++++++++++++++++------------- 2 files changed, 717 insertions(+), 256 deletions(-)