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

commit fb08e8a0f261727b2a90fbb563e854b4f58bdb80 Merge: b9ee58ae b26ed3a3 Author: Nicolas Vigier boklm@torproject.org Date: Thu Sep 6 01:43:54 2018 +0200

Merge branch 'master' into staging

css/layout.css | 3 - css/layout.min.css | 2 +- include/lang.wmi | 9 ++ include/versions.wmi | 10 +- projects/en/torbrowser.wml | 180 ++++++++++++++++------------- projects/torbrowser/RecommendedTBBVersions | 10 +- 6 files changed, 124 insertions(+), 90 deletions(-)