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

[hiro at torproject.org]

commit 7bf7ad9ebe1628193b1c5f9e3f2a455fd6fd282e
Merge: 646ccefe 52c29243
Author: hiromipaw <hiro at torproject.org>
Date:   Mon Aug 14 14:39:21 2017 +0200

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

 about/en/corepeople.wml                    |  2 +-
 about/en/sponsors.wml                      | 16 +++++------
 include/versions.wmi                       | 44 +++++++++++++++---------------
 projects/torbrowser/RecommendedTBBVersions | 18 ++++++------
 4 files changed, 39 insertions(+), 41 deletions(-)