[tor-commits] [webwml/staging] Merge branch 'master' into 24697

[arma at torproject.org]

commit 5f57207af84078147438019516ca912c698404f7
Merge: 47a6ab07 509f2fd5
Author: hiromipaw <hiro at torproject.org>
Date:   Tue Jan 2 19:41:47 2018 +0100

    Merge branch 'master' into 24697

 include/mirrors-table.wmi | 538 ++++++++++++++++++++++++++--------------------
 include/tor-mirrors.csv   | 185 ++++++++--------
 2 files changed, 397 insertions(+), 326 deletions(-)