commit fb9c9e04f002fbbd9745911a17481b49ed66c9f4
Merge: f197d18 de08f2d
Author: Nick Mathewson <ni...@torproject.org>
Date: Tue Apr 26 19:27:39 2016 -0400
Merge branch 'maint-0.2.8'
changes/fallbacks-201604 | 9 +
scripts/maint/fallback.blacklist | 156 ++++
scripts/maint/fallback.whitelist | 678 +++++++++++++++++-
scripts/maint/updateFallbackDirs.py | 1354 +++++++++++++++++++++++++----------
src/or/fallback_dirs.inc | 516 ++++++-------
5 files changed, 2062 insertions(+), 651 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
