commit 7bb2cd0c8e11be6b023ec4485bd1db403eaf395e Merge: bdac1a4 09cd788 Author: Nick Mathewson nickm@torproject.org Date: Tue May 16 08:35:02 2017 -0400

Merge remote-tracking branch 'teor/fallback-inputs'

changes/bug20913 | 9 +++++++++ changes/bug21121 | 3 +++ scripts/maint/fallback.blacklist | 20 ++++++++++++++++++++ scripts/maint/fallback.whitelist | 35 +++++++++++++++++------------------ scripts/maint/updateFallbackDirs.py | 10 +++++++--- 5 files changed, 56 insertions(+), 21 deletions(-)