commit c94a7c2c5535d0b0548ed0f99e8819ff5ff9a858 Merge: 467ed909 59a33abb Author: hiromipaw hiro@torproject.org Date: Tue Jan 30 12:04:40 2018 +0100

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

Makefile | 2 +- include/versions.wmi | 14 +- projects/en/torbrowser.wml | 4 +- projects/torbrowser/RecommendedTBBVersions | 20 +- projects/torbrowser/design/index.html.en | 763 ++++++++++++++++++----------- 5 files changed, 489 insertions(+), 314 deletions(-)