commit abe086532ce762fda147042f4cb5e4134e6f639c Merge: 96588533 492a32ee Author: hiro hiro@torproject.org Date: Thu Sep 6 18:45:10 2018 +0200

Merge branch 'master' into staging

download/en/download-easy.wml | 39 +++++++++++-- download/en/download.wml | 129 +++++++++++++++++++++++++++++++++++++++++- include/versions.wmi | 2 +- js/dlpage01.js | 1 + projects/en/torbrowser.wml | 30 ++++++++++ 5 files changed, 194 insertions(+), 7 deletions(-)