[tor-commits] [tor/release-0.2.8] Merge remote-tracking branch 'teor/broken-028-fallbacks' into maint-0.2.8

[nickm at torproject.org]

commit db6153e70c55cbe4569900d2c714d2f305f31f26
Merge: ad1824f 30275b0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 23 09:29:55 2016 -0400

    Merge remote-tracking branch 'teor/broken-028-fallbacks' into maint-0.2.8

 changes/broken-028-fallbacks | 3 +++
 src/or/fallback_dirs.inc     | 6 ++++--
 2 files changed, 7 insertions(+), 2 deletions(-)