[tor-commits] [tor/maint-0.2.8] Merge remote-tracking branch 'teor/fallback-script' into maint-0.2.8

[nickm at torproject.org]

commit 6cc3397e26ff37d6f01471b83e0e5bb1b5aa8eee
Merge: e8cc9f3 ab06b79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 16 08:33:17 2016 -0400

    Merge remote-tracking branch 'teor/fallback-script' into maint-0.2.8

 scripts/maint/updateFallbackDirs.py | 57 +++++++++++++++++++++++--------------
 1 file changed, 35 insertions(+), 22 deletions(-)