commit 91be6a77e9f16a9817b20c5b0f5ba3df3b54b31f Merge: 198342607 6bc5c06dc Author: Nick Mathewson <nickm@torproject.org> Date: Tue Dec 11 10:04:16 2018 -0500 Merge remote-tracking branch 'teor/ticket24838' changes/ticket24838 | 6 + changes/ticket28768 | 4 + scripts/maint/fallback.whitelist | 37 ++--- scripts/maint/updateFallbackDirs.py | 302 +++++++++++++++++++++++++++--------- 4 files changed, 248 insertions(+), 101 deletions(-)