commit f3575a45cec35f3dee1bcef9237d5e63052405b5 Merge: 1995328 1c4a2dd Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 29 10:23:38 2016 -0400

Merge branch 'maint-0.2.8'

changes/bug19782 | 3 +++ scripts/maint/fallback.blacklist | 3 +++ scripts/maint/fallback.whitelist | 3 --- src/or/fallback_dirs.inc | 8 +++++--- 4 files changed, 11 insertions(+), 6 deletions(-)