[tor-commits] [tor/master] Merge remote-tracking branch 'imnotbad/bug26502'

commit 413b73450cbb5410c822a4887aaf51e968599e05 Merge: 28db2c929 85fa69297 Author: Nick Mathewson nickm@torproject.org Date: Thu Jul 12 09:30:01 2018 -0400

Merge remote-tracking branch 'imnotbad/bug26502'

changes/bug26502 | 3 + scripts/maint/fallback.blacklist | 232 ------------------------------------ scripts/maint/updateFallbackDirs.py | 157 +++--------------------- 3 files changed, 21 insertions(+), 371 deletions(-)