[tor-commits] [tpo/staging] Merge branch 'master' into 'master'
gus at torproject.org
gus at torproject.org
Mon Jul 20 17:24:56 UTC 2020
commit 45325bd07147bafbcbbd4dba662f544a53aef25c
Merge: 8b6151b5 f4bad6a2
Author: Antonela <antonela at torproject.org>
Date: Mon Jul 20 13:35:14 2020 +0000
Merge branch 'master' into 'master'
Master
See merge request antonela/tpo!1
.github/FUNDING.yml | 3 +
.htaccess | 17 +-
README.md | 63 +
assets/javascript | 2 +-
assets/scss | 2 +-
assets/static/css | 2 +-
assets/static/fonts | 2 +-
assets/static/images/circle-pattern.png | Bin 556240 -> 106272 bytes
assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes
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 at 3x.png | Bin 0 -> 124543 bytes
assets/static/images/home/svg/take-back.svg | 7902 ++++++++++++++++++++
assets/static/images/people/acute.png | Bin 0 -> 43888 bytes
assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes
assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes
assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes
assets/static/images/people/isabela.png | Bin 46938 -> 834334 bytes
assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes
assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes
assets/static/images/people/orig/acute.jpg | Bin 0 -> 33472 bytes
assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes
assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes
assets/static/images/privchat/carmela.png | Bin 0 -> 274355 bytes
assets/static/images/privchat/dkg.png | Bin 0 -> 230884 bytes
assets/static/images/privchat/matt.png | Bin 0 -> 199735 bytes
assets/static/images/privchat/pattern.png | Bin 0 -> 325952 bytes
assets/static/images/privchat/privchat.png | Bin 0 -> 19090 bytes
assets/static/images/privchat/privchat.svg | 11 +
assets/static/images/privchat/roger.png | Bin 0 -> 192986 bytes
.../sponsors/Georgetown_logotype_S_blueRGB.png | Bin 0 -> 31850 bytes
assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes
assets/static/images/sponsors/RIPE_NCC_logo.png | Bin 0 -> 49160 bytes
.../sponsors/craig-newmark-philanthropies.png | Bin 0 -> 28397 bytes
assets/static/images/sponsors/dial.png | Bin 0 -> 26001 bytes
assets/static/images/sponsors/gsoc.png | Bin 0 -> 33641 bytes
assets/static/images/sponsors/zcash_logo.png | Bin 0 -> 48816 bytes
assets/static/images/tb95/onion-auth.png | Bin 0 -> 52389 bytes
assets/static/images/tb95/onion-auth2.png | Bin 0 -> 79194 bytes
assets/static/images/tb95/onion-auth2 at 2x.png | Bin 0 -> 270354 bytes
assets/static/images/tb95/onion-auth at 2x.png | Bin 0 -> 192867 bytes
assets/static/images/tb95/onion-error.png | Bin 0 -> 86735 bytes
assets/static/images/tb95/onion-error at 2x.png | Bin 0 -> 305169 bytes
.../images/tb95/onion-location-propublica.png | Bin 0 -> 195783 bytes
.../images/tb95/onion-location-propublica2.png | Bin 0 -> 84147 bytes
.../images/tb95/onion-location-propublica2 at 2x.png | Bin 0 -> 295176 bytes
.../images/tb95/onion-location-propublica at 2x.png | Bin 0 -> 659848 bytes
.../static/images/tb95/onion-location-riseup.png | Bin 0 -> 152691 bytes
.../images/tb95/onion-location-riseup at 2x.png | Bin 0 -> 471532 bytes
assets/static/images/tb95/onion-names.png | Bin 0 -> 89241 bytes
assets/static/images/tb95/onion-names at 2x.png | Bin 0 -> 306049 bytes
assets/static/images/tb95/onion-url-bar-update.png | Bin 0 -> 39914 bytes
.../static/images/tb95/onion-url-bar-update at 2x.png | Bin 0 -> 108234 bytes
.../png/TBAa-onboarding.png | Bin 58890 -> 54696 bytes
.../png/TBAa-onboarding at 2x.png | Bin 159182 -> 145259 bytes
assets/static/js | 2 +-
assets/static/keys/dawuud.txt | 471 --
assets/static/keys/dennisjackson.txt | 52 +
assets/static/keys/jnewsome.txt | 52 +
assets/static/keys/juris.txt | 321 -
assets/static/keys/nyinz.txt | 57 -
assets/static/keys/sstevenson.txt | 79 +
assets/static/keys/t0mmy.txt | 51 -
configs/i18n.ini | 2 +-
content/about/cy-pres/contents.lr | 6 +-
content/about/history/contents.lr | 4 +-
.../about/jobs/backend-engineer-ooni/contents.lr | 6 +-
content/about/jobs/browser-developer/contents.lr | 2 +
.../jobs/developer-data-architect/contents.lr | 2 +
content/about/jobs/executive-assistant/contents.lr | 105 +
.../jobs/senior-system-administrator/contents.lr | 2 +
.../jobs/shadow-simulation-developer/contents.lr | 91 +
content/about/people/acute/contents.lr | 19 +
content/about/people/agrabeli/contents.lr | 2 +-
content/about/people/ahf/contents.lr | 2 +-
content/about/people/ailanthus/contents.lr | 19 -
content/about/people/anarcat/contents.lr | 17 +
content/about/people/arma/contents.lr | 4 +-
content/about/people/dawuud/contents.lr | 20 -
content/about/people/djackson/contents.lr | 21 +
content/about/people/geko/contents.lr | 2 +-
content/about/people/ggus/contents.lr | 6 +-
content/about/people/hellais/contents.lr | 2 +-
content/about/people/igt0/contents.lr | 17 -
content/about/people/isra/contents.lr | 15 -
content/about/people/jnewsome/contents.lr | 23 +
content/about/people/juga/contents.lr | 2 +-
content/about/people/juris/contents.lr | 15 -
content/about/people/leif/contents.lr | 13 -
content/about/people/meejah/contents.lr | 2 +
content/about/people/narrira/contents.lr | 17 +
content/about/people/pepijn/contents.lr | 19 -
content/about/people/sajolida/contents.lr | 2 +-
content/about/people/schneier-core/contents.lr | 15 +
content/about/people/schneier/contents.lr | 13 +
content/about/people/sengler/contents.lr | 17 +
content/about/people/sstevenson/contents.lr | 4 +
content/about/people/wayward/contents.lr | 19 -
content/about/people/wshackleton/contents.lr | 20 +
.../about/reports/2009-data-collection/contents.lr | 2 +-
.../about/reports/2010-irs-form-990/contents.lr | 4 +-
content/about/reports/2011-form-pc/contents.lr | 2 +-
.../reports/2012-financial-statements/contents.lr | 2 +-
content/about/reports/2012-form-pc/contents.lr | 2 +-
content/about/reports/2013-form-pc/contents.lr | 2 +-
.../2016-12-05-tor-project-bylaws/contents.lr | 6 +-
.../about/sponsors/DARPA-georgetown/contents.lr | 19 +
content/about/sponsors/DARPA-penn/contents.lr | 6 +-
content/about/sponsors/RIPE NCC/.gitkeep | 0
.../about/sponsors/USSD-DHRL-harvard/contents.lr | 4 +-
content/about/sponsors/USSD-DHRL/contents.lr | 3 +-
content/about/sponsors/Zcash/contents.lr | 20 +
.../craig-newmark-philanthropies/contents.lr | 19 +
content/about/sponsors/dial/contents.lr | 19 +
content/about/sponsors/google-soc/contents.lr | 14 +-
content/about/sponsors/google-sod/contents.lr | 4 +-
content/about/sponsors/handshake/contents.lr | 2 +-
content/about/sponsors/mozilla/contents.lr | 4 +-
content/about/sponsors/mullvad-vpn/contents.lr | 19 +
content/about/sponsors/nsf-georgetown/contents.lr | 12 +-
content/about/sponsors/nsf-minnesota/contents.lr | 2 +-
content/about/sponsors/nsf-rochester/contents.lr | 4 +-
content/about/sponsors/otf/contents.lr | 3 +-
content/about/sponsors/ripe-ncc/contents.lr | 19 +
content/about/sponsors/rose/contents.lr | 2 +-
content/about/trademark/contents.lr | 21 +
content/about/trademark/trademark-faq/contents.lr | 15 +
.../trademark-faq/trademark-faq-1/contents.lr | 13 +
.../trademark-faq/trademark-faq-2/contents.lr | 12 +
.../trademark-faq/trademark-faq-3/contents.lr | 13 +
.../trademark-faq/trademark-faq-4/contents.lr | 16 +
.../trademark-faq/trademark-faq-5/contents.lr | 21 +
.../trademark-faq/trademark-faq-6/contents.lr | 10 +
.../trademark-faq/trademark-faq-7/contents.lr | 13 +
content/download/alpha/contents.lr | 2 +-
content/download/languages/contents.lr | 2 +-
content/menu/contents.lr | 2 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../bbc-news-launches-tor-mirror-site/contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../interview-with-the-tor-project/contents.lr | 19 +
.../contents.lr | 19 +
content/press/new-release-tor-browser/contents.lr | 2 +-
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
.../contents.lr | 19 +
content/privchat/contents.lr | 3 +
.../torbrowser/RecommendedTBBVersions/contents.lr | 24 +-
content/releases/contents.lr | 11 +
content/releases/tor-browser-95/contents.lr | 83 +
content/thank-you/contents.lr | 1 -
databags/about+bn-BD.ini | 1 -
databags/about+de.ini | 1 -
databags/about+es.ini | 1 -
databags/about+fr.ini | 1 -
databags/about+id.ini | 1 -
databags/about+is.ini | 1 -
databags/about+it.ini | 1 -
databags/about+ka.ini | 1 -
databags/about+ko.ini | 1 -
databags/about+pt-BR.ini | 1 -
databags/about+ru.ini | 1 -
databags/about+tr.ini | 1 -
databags/about+zh-CN.ini | 1 -
databags/{about+en.ini => about.ini} | 5 +
databags/alternatives.ini | 8 +-
databags/download-alternatives-alpha.ini | 14 +-
databags/download-alternatives.ini | 22 +-
databags/links.ini | 1 +
databags/menu+bn-BD.ini | 19 -
databags/menu+de.ini | 19 -
databags/menu+en.ini | 19 -
databags/menu+es.ini | 19 -
databags/menu+fr.ini | 19 -
databags/menu+id.ini | 19 -
databags/menu+is.ini | 19 -
databags/menu+it.ini | 19 -
databags/menu+ka.ini | 19 -
databags/menu+ko.ini | 19 -
databags/menu+pt-BR.ini | 19 -
databags/menu+ru.ini | 19 -
databags/menu+tr.ini | 19 -
databags/menu+zh-CN.ini | 19 -
databags/menu.ini | 1 +
databags/menu_footer+bn-BD.ini | 1 -
databags/menu_footer+de.ini | 1 -
databags/menu_footer+en.ini | 15 -
databags/menu_footer+es.ini | 1 -
databags/menu_footer+fr.ini | 1 -
databags/menu_footer+id.ini | 1 -
databags/menu_footer+is.ini | 1 -
databags/menu_footer+it.ini | 1 -
databags/menu_footer+ka.ini | 1 -
databags/menu_footer+ko.ini | 1 -
databags/menu_footer+pt-BR.ini | 1 -
databags/menu_footer+ru.ini | 1 -
databags/menu_footer+tr.ini | 1 -
databags/menu_footer+zh-CN.ini | 1 -
databags/menu_footer.ini | 1 +
databags/platforms.ini | 4 +-
databags/versions.ini | 20 +-
lego | 2 +-
models/job.ini | 4 +
models/person.ini | 5 +
models/question.ini | 20 +
models/topic.ini | 23 +
models/trademark.ini | 34 +
templates/about.html | 16 +-
templates/banner.html | 1 +
templates/contact.html | 13 +-
templates/download-android.html | 34 +-
templates/download-languages.html | 6 +-
templates/download-options.html | 44 +-
templates/download-tor.html | 14 +-
templates/download.html | 6 +-
templates/footer-min.html | 92 +
templates/hero-download.html | 32 +-
templates/home.html | 2 +-
templates/homepage.html | 18 +-
templates/jobs.html | 2 +-
templates/layout.html | 13 +-
templates/macros/contact.html | 2 +-
templates/macros/downloads.html | 19 +-
templates/macros/footer.html | 2 +-
templates/macros/people.html | 5 +-
templates/macros/question.html | 22 +
templates/macros/topic.html | 18 +
templates/meta.html | 16 +-
templates/navbar-min.html | 49 +
templates/people.html | 24 +-
templates/privchat.html | 111 +
templates/question.html | 6 +
templates/release.html | 65 +
templates/releases.html | 14 +
templates/sidenav.html | 5 +-
templates/thank-you.html | 18 +-
templates/topic.html | 6 +
templates/trademark.html | 6 +
tpo.lektorproject | 7 +-
250 files changed, 10086 insertions(+), 1529 deletions(-)
More information about the tor-commits
mailing list