commit df87812b41abccd63eab97bd81b476ce61e16f26 Merge: 3341ad1 a0bbd72 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 20 18:38:45 2016 -0500

Merge remote-tracking branch 'teor/fallbacks-20161219'

changes/fallbacks-201612 | 37 ++++ scripts/maint/fallback.blacklist | 37 +++- scripts/maint/fallback.whitelist | 208 +++++++++++------- scripts/maint/updateFallbackDirs.py | 410 +++++++++++++++++++++++++----------- 4 files changed, 494 insertions(+), 198 deletions(-)