commit 753c7af4b1d892c8b6397a47daac4e4968298dc0 Merge: 4771d7fe 86a86d75 Author: hiromipaw hiro@torproject.org Date: Wed Dec 20 11:47:04 2017 +0100

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

include/versions.wmi | 4 ++-- projects/torbrowser/RecommendedTBBVersions | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-)