commit 5ff2d8d7706f1f1d7790185b76ddfc8a7c575e01 Merge: efba81e3b 1c5c5f0e5 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 8 11:10:36 2018 -0500

Merge branch 'maint-0.3.2' into release-0.3.2

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