[tor-commits] [tor/master] Merge branch 'bug19071-extra-squashed' into maint-0.2.8

[nickm@xxxxxxxxxxxxxx]

commit 2c9354fc1087c8b0bbfa7273106195e74540c731
Merge: bc9a0f8 26146db
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Jun 28 19:15:20 2016 -0400

    Merge branch 'bug19071-extra-squashed' into 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(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits