[tor-commits] [tpo/staging] Merge master

[emmapeel@xxxxxxxxxxxxxx]

commit 95e62263a11bbd162f1da643f45e86f70a8c9886
Merge: 0b0aec7 ff50627
Author: hiro <hiro@xxxxxxxxxxxxxx>
Date:   Fri Oct 25 23:26:25 2019 +0200

    Merge master

 .htaccess                                          |    9 +-
 assets/static/images/favicon/favicon.ico           |  Bin 0 -> 4286 bytes
 assets/static/images/favicon/favicon.png           |  Bin 0 -> 1184 bytes
 assets/static/images/home/png/take-back@xxxxxx     |  Bin 0 -> 124543 bytes
 assets/static/images/home/svg/take-back.svg        | 7902 ++++++++++++++++++++
 assets/static/images/people/orig/wshackleton.png   |  Bin 0 -> 239868 bytes
 assets/static/images/people/wshackleton.png        |  Bin 0 -> 29922 bytes
 assets/static/keys/sstevenson.txt                  |   79 +
 content/about/history/contents.lr                  |    4 +-
 .../about/jobs/backend-engineer-ooni/contents.lr   |    2 +
 content/about/jobs/browser-developer/contents.lr   |    2 +
 .../jobs/developer-data-architect/contents.lr      |    2 +
 .../jobs/senior-system-administrator/contents.lr   |    2 +
 .../jobs/shadow-simulation-developer/contents.lr   |   91 +
 content/about/people/ahf/contents.lr               |    2 +-
 content/about/people/anarcat/contents.lr           |   17 +
 content/about/people/arma/contents.lr              |    2 +-
 content/about/people/igt0/contents.lr              |   17 -
 content/about/people/meejah/contents.lr            |    2 +
 content/about/people/schneier-core/contents.lr     |   15 +
 content/about/people/schneier/contents.lr          |   13 +
 content/about/people/sstevenson/contents.lr        |    4 +
 content/about/people/wshackleton/contents.lr       |   20 +
 .../about/sponsors/DARPA-georgetown/contents.lr    |   19 +
 .../about/sponsors/USSD-DHRL-harvard/contents.lr   |    4 +-
 content/about/sponsors/USSD-DHRL/contents.lr       |    3 +-
 content/about/sponsors/nsf-georgetown/contents.lr  |    7 +-
 content/about/sponsors/nsf-minnesota/contents.lr   |    2 +-
 content/about/sponsors/nsf-rochester/contents.lr   |    4 +-
 content/about/sponsors/otf/contents.lr             |    3 +-
 content/download/languages/contents.lr             |    2 +-
 content/press/new-release-tor-browser/contents.lr  |    2 +-
 .../torbrowser/RecommendedTBBVersions/contents.lr  |   16 +-
 databags/download-alternatives.ini                 |    8 +
 databags/versions.ini                              |   14 +-
 lego                                               |    2 +-
 models/job.ini                                     |    4 +
 models/person.ini                                  |    5 +
 templates/contact.html                             |    4 +-
 templates/download-android.html                    |   10 +-
 templates/download-options.html                    |    5 +
 templates/download-tor.html                        |   10 +-
 templates/hero-download.html                       |    2 +-
 templates/homepage.html                            |   10 +-
 templates/jobs.html                                |    2 +-
 templates/layout.html                              |    9 +-
 templates/macros/contact.html                      |    2 +-
 templates/macros/downloads.html                    |    8 +-
 templates/macros/people.html                       |    3 +
 templates/meta.html                                |    9 +
 50 files changed, 8270 insertions(+), 84 deletions(-)



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