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

[hiro at torproject.org]

commit 1cfaef279fc3242e1396e7924ac7388d7ca302f7
Merge: a085cc07 1a9bc4f0
Author: hiromipaw <hiro at torproject.org>
Date:   Mon Aug 7 18:49:00 2017 +0200

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

 Makefile                                   |   4 +-
 about/en/corepeople.wml                    |  89 ++++----
 include/versions.wmi                       |   4 +-
 keys/juris.txt                             | 321 +++++++++++++++++++++++++++++
 projects/torbrowser/RecommendedTBBVersions |   1 -
 5 files changed, 374 insertions(+), 45 deletions(-)