commit 7b6d7aae09ae2fe1b809c57d228c4de0bf72aa67 Merge: ab58f60 ab3c864 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 18 20:16:05 2016 -0500

Merge branch 'fallbacks-0281-squashed'

changes/ticket17158 | 7 ++ scripts/maint/fallback.blacklist | 22 ++++ scripts/maint/fallback.whitelist | 87 +++++++++++++++ scripts/maint/updateFallbackDirs.py | 4 +- src/or/fallback_dirs.inc | 207 ++++++++++++++++++++++++++++++++++- 5 files changed, 324 insertions(+), 3 deletions(-)