commit 69fc025e956f5a87db0860a1be54e6d3612c8074 Merge: 88ad2f5 e220214 Author: Nick Mathewson <nickm@torproject.org> Date: Sun Feb 28 15:51:22 2016 +0100 Merge remote-tracking branch 'teor/fallbacks-201602-v2' scripts/maint/fallback.whitelist | 4 +- scripts/maint/updateFallbackDirs.py | 92 ++++++++++- src/or/fallback_dirs.inc | 320 +++++++++++++++++++++++------------- 3 files changed, 294 insertions(+), 122 deletions(-)