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

[nickm at torproject.org]

commit bdac1a431fb633100fc60895eb869f600df96d58
Merge: 74e7be1 3f28824
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 16 08:32:54 2017 -0400

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

 changes/bug22270                    | 4 ++++
 scripts/maint/updateFallbackDirs.py | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)