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

[hiro@xxxxxxxxxxxxxx]

commit 667157ad3342f8f79156f88e3535ddc7a19f1c7b
Merge: 8e9bb09 8d8c1eb
Author: hiromipaw <hiro@xxxxxxxxxxxxxx>
Date:   Wed Jan 11 16:00:30 2017 +0100

    Merge branch 'people' into staging

 .htaccess                                  |   8 +-
 Makefile                                   |   5 +-
 about/en/contributors.wml                  |  37 ++-
 about/en/corepeople.wml                    |  52 ++--
 about/en/jobs-comm-director.wml            | 170 ++++++++++++
 about/en/jobs-coredev.wml                  |  13 +-
 about/en/jobs-ooni-ux-designer.wml         | 105 --------
 about/en/jobs.wml                          |   6 +-
 docs/en/debian.wml                         |  12 +-
 docs/en/faq.wml                            |   5 +-
 docs/en/verifying-signatures.wml           |   5 +-
 getinvolved/en/volunteer.wml               |  23 --
 include/versions.wmi                       |  53 ++--
 press/en/press.wml                         | 399 ++++++++++++++++++++++++++++-
 projects/en/torbrowser.wml                 |  45 +++-
 projects/torbrowser/RecommendedTBBVersions |  20 +-
 16 files changed, 731 insertions(+), 227 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits