[tor-commits] [tor/master] Merge remote-tracking branch 'teor/fallback-code-2018-01'

[nickm at torproject.org]

commit 143da73165d48f21300ee6771b269db98ac76632
Merge: 0b6fe3c12 65520f1bd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jan 5 16:47:28 2018 -0500

    Merge remote-tracking branch 'teor/fallback-code-2018-01'

 changes/bug20942                          |   3 +
 changes/bug24708                          |   4 +
 changes/ticket22321                       |   3 +
 changes/ticket22759                       |   5 +
 changes/ticket24600                       |   5 +
 changes/ticket24679                       |   5 +
 changes/ticket24706                       |   6 +
 changes/ticket24725                       |   5 +
 changes/ticket24726                       |   4 +
 changes/ticket24785                       |   6 +
 changes/ticket24791                       |   3 +
 scripts/maint/fallback.blacklist          |  54 +--
 scripts/maint/fallback.whitelist          | 323 ++++++++++---
 scripts/maint/generateFallbackDirLine.py  |  38 ++
 scripts/maint/lookupFallbackDirContact.py |  28 ++
 scripts/maint/updateFallbackDirs.py       | 225 ++++++---
 src/or/fallback_dirs.inc                  | 761 ++++++++++++++++++++++++------
 17 files changed, 1146 insertions(+), 332 deletions(-)