commit 58d2ced5729f04c5bd07cbc4f47099cf375ce962 Merge: ce501a529 d9b9c1fa7 Author: Nick Mathewson nickm@torproject.org Date: Tue Dec 11 09:38:27 2018 -0500

Merge remote-tracking branch 'teor/24805-phoul'

changes/ticket24805 | 3 + scripts/maint/fallback.whitelist | 138 ++++++++++++++++++++++++++++++--------- 2 files changed, 111 insertions(+), 30 deletions(-)