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

[hiro at torproject.org]

commit 7e3fccb40a7c619f44845b5495bfab411141b777
Merge: e670475b 52c29243
Author: hiromipaw <hiro at torproject.org>
Date:   Thu Aug 24 16:21:48 2017 +0200

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

 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(-)