[tor-commits] [tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8

[nickm at torproject.org]

commit 89e4126cd9cb438727756b0c577d3b08a4af6482
Merge: 53d4c50 db6153e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 23 09:30:48 2016 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

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