commit e27390e76ca3ffdb6981067fe7ed4ac5f0854943 Merge: 1f0363b fd8c847 Author: hiromipaw hiro@torproject.org Date: Wed Jan 25 17:17:44 2017 +0100

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

Makefile | 4 +- include/lang.wmi | 2 +- include/versions.wmi | 60 +++++++++++++++--------------- projects/en/torbrowser.wml | 22 +++++------ projects/torbrowser/RecommendedTBBVersions | 12 +++++- 5 files changed, 54 insertions(+), 46 deletions(-)