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

commit 08ceceb08dd1099d394872f5226a5c165be0ea6d Merge: 42dd7261 c94a7c2c Author: hiromipaw hiro@torproject.org Date: Tue Jan 30 13:43:06 2018 +0100

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

Makefile | 2 +- docs/en/rpms.wml | 47 ------------ docs/en/sidenav.wmi | 3 - include/versions.wmi | 2 +- projects/torbrowser/RecommendedTBBVersions | 12 ---- projects/torbrowser/design/index.html.en | 112 +++++++++++++++++++++++------ 6 files changed, 91 insertions(+), 87 deletions(-)