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

[nickm at torproject.org]

commit 06d99aa2c42de6013b3fa55ac03c661f57f90047
Merge: 32926b0 19a9872
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 20 19:29:17 2016 -0400

    Merge branch 'maint-0.2.8'

 src/or/fallback_dirs.inc | 46 ++++++++++++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 16 deletions(-)