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

[nickm at torproject.org]

commit 61dac57aa3790464dd50da9bbc78fd275f511f3d
Merge: cb8557f 421a7c8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 22 08:20:11 2016 -0400

    Merge branch 'maint-0.2.8'

 changes/ticket19071-19480           | 10 +++++
 scripts/maint/fallback.blacklist    | 41 ++++++++++++++++---
 scripts/maint/fallback.whitelist    | 79 +++++++++++++++++++------------------
 scripts/maint/updateFallbackDirs.py | 16 +++++++-
 src/or/fallback_dirs.inc            | 18 +++++++++
 5 files changed, 118 insertions(+), 46 deletions(-)