[tor-commits] [tor/master] Merge branch 'fallbacks-201702-v3' into fallbacks-2017-05

commit 0e81e2114adb16787d865e2f658183c9b5abdd23 Merge: 3f28824 28d523f Author: teor teor2345@gmail.com Date: Tue May 16 18:03:00 2017 +1000

Merge branch 'fallbacks-201702-v3' into fallbacks-2017-05

changes/bug20913 | 7 +++++++ changes/bug21121 | 3 +++ scripts/maint/fallback.blacklist | 6 ++++++ scripts/maint/fallback.whitelist | 25 +++++++++++++++++-------- scripts/maint/updateFallbackDirs.py | 8 ++++++-- 5 files changed, 39 insertions(+), 10 deletions(-)