commit 616edbb9b49fe160dd517fde066b472390548536 Merge: 1b806313 88b17d9e Author: hiromipaw <hiro@torproject.org> Date: Thu Sep 7 15:56:40 2017 +0200 Merge branch 'master' of ssh://git-rw.torproject.org/project/web/webwml Makefile | 2 +- include/versions.wmi | 22 +++++++++++----------- projects/torbrowser/RecommendedTBBVersions | 4 ++++ 3 files changed, 16 insertions(+), 12 deletions(-)