commit cc6fcbde4ea11ef66a9e0c3fe62d007491f8cb22 Merge: cf13189 421a7c8 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 22 08:19:51 2016 -0400

Merge branch 'maint-0.2.8' into release-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(-)