commit 34879d0a4b47815af413d169fbbde0162068bb00 Merge: 87ea2b6 2c9354f Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 28 19:15:32 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

changes/ticket19071-19480 | 3 ++ scripts/maint/fallback.whitelist | 4 +-- scripts/maint/updateFallbackDirs.py | 9 +++-- src/or/fallback_dirs.inc | 67 +++++++++++++++++++------------------ 4 files changed, 47 insertions(+), 36 deletions(-)