[tor-commits] [webwml/staging] Merge branch 'master' into staging

[boklm at torproject.org]

commit 12cd78c79b78ab182c90b93d629c83805ee65cfb
Merge: a61cc30e a534ef42
Author: Nicolas Vigier <boklm at torproject.org>
Date:   Thu Nov 16 12:23:57 2017 +0100

    Merge branch 'master' into staging

 projects/torbrowser/RecommendedTBBVersions | 9 ---------
 1 file changed, 9 deletions(-)