[tor-commits] [tor/master] Merge branch 'maint-0.2.8'

[nickm at torproject.org]

commit 6a011645381745ecb6f798b332124c4c95b6b0c1
Merge: 5d1095b db6153e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 23 09:30:56 2016 -0400

    Merge branch 'maint-0.2.8'

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