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

[nickm at torproject.org]

commit df842d84a8879a976401ea57bc435497ef6d234e
Merge: 1e4a5dc 5b45d73
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 16 08:38:53 2017 -0400

    Merge branch 'maint-0.2.8' into release-0.2.8

 changes/ticket21564      |   6 ++
 src/or/fallback_dirs.inc | 179 +++++++++++++++++------------------------------
 2 files changed, 69 insertions(+), 116 deletions(-)