commit 9a61d3f5adf1e4e61a0d51fb6f9368339f5330cc Merge: c281e587b d47e7863b Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 15 08:25:35 2019 -0500

Merge branch 'bug24953_squashed'

changes/bug24953 | 4 ++++ scripts/maint/updateFallbackDirs.py | 43 ++++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 12 deletions(-)