commit f42dbc4e263d3c5f9021d062c5ea0d3cfa29d47b Merge: d793a98 2c9354f Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 28 19:15:43 2016 -0400

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