[tor-commits] [webwml/master] Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging

[hiro at torproject.org]

commit 55f70bc39a9ae3012ce3c826fb3ccf847697acd5
Merge: 2a7cddc8 56d63982
Author: hiromipaw <hiro at torproject.org>
Date:   Thu Nov 16 18:39:49 2017 +0100

    Merge branch 'staging' of ssh://git-rw.torproject.org/project/web/webwml into staging

 download/en/download-easy.wml              |   4 +-
 download/en/download.wml                   |  18 +---
 include/versions.wmi                       |  56 ++++++----
 projects/en/torbrowser.wml                 | 166 +++++++++++++++++++++--------
 projects/torbrowser/RecommendedTBBVersions |  15 +--
 5 files changed, 166 insertions(+), 93 deletions(-)