commit e0306320b543049bc66adb19e359b369c66fb775 Merge: 56a2b8d 4181e81 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 19 07:27:39 2016 -0500

Merge remote-tracking branch 'teor/new-fallbacks-028-20161219' into maint-0.2.8

changes/ticket20170-v3 | 5 + src/or/fallback_dirs.inc | 392 ++++++++++++++++++++++++++++++++--------------- 2 files changed, 272 insertions(+), 125 deletions(-)