[tor-commits] [tor/master] Merge remote-tracking branch 'teor/ticket24682'

commit f92b5337573bcc5bf94cd034c033c11db4eca811 Merge: 83ced3e7f 1a29ad611 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Dec 20 10:14:43 2017 -0500 Merge remote-tracking branch 'teor/ticket24682' scripts/maint/updateFallbackDirs.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)