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

[nickm at torproject.org]

commit 6a00e703a2044c2f2a830cbfbd885c2c1cdad713
Merge: 9a998e1 e030632
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Dec 19 07:30:30 2016 -0500

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket20170-v3   |   5 +
 src/or/fallback_dirs.inc | 392 ++++++++++++++++++++++++++++++++---------------
 2 files changed, 272 insertions(+), 125 deletions(-)