[tor-commits] [tpo/staging] Merge branch 'master' into 'master'
commit 992048474405c20504f8528bdd93bdb39568caae Merge: 45325bd0 647c3f8d Author: Antonela Date: Mon Jul 27 13:51:28 2020 + Merge branch 'master' into 'master' Rebase master See merge request antonela/tpo!2 assets/static/images/membership/green.png | Bin 0 -> 239288 bytes assets/static/images/membership/header.png | Bin 0 -> 334841 bytes assets/static/images/membership/logos/Avast.png| Bin 0 -> 78009 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 + assets/static/images/membership/shallot.png| Bin 0 -> 208458 bytes assets/static/images/membership/vidalia.png| Bin 0 -> 169283 bytes .../static/images/sponsors/Bertha_Foundation.jpg | Bin 0 -> 451667 bytes content/about/membership/contents.lr | 13 ++ content/about/sponsors/Bertha/contents.lr | 19 ++ templates/membership.html | 138 +++ 10 files changed, 367 insertions(+) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Merge branch 'master' into 'master'
commit 45325bd07147bafbcbbd4dba662f544a53aef25c Merge: 8b6151b5 f4bad6a2 Author: Antonela Date: Mon Jul 20 13:35:14 2020 + 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-b...@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-au...@2x.png | Bin 0 -> 270354 bytes assets/static/images/tb95/onion-a...@2x.png| Bin 0 -> 192867 bytes assets/static/images/tb95/onion-error.png | Bin 0 -> 86735 bytes assets/static/images/tb95/onion-er...@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-propubli...@2x.png | Bin 0 -> 295176 bytes .../images/tb95/onion-location-propubl...@2x.png | Bin 0 -> 659848 bytes .../static/images/tb95/onion-location-riseup.png | Bin 0 -> 152691 bytes .../images/tb95/onion-location-ris...@2x.png | Bin 0 -> 471532 bytes assets/static/images/tb95/onion-names.png | Bin 0 -> 89241 bytes assets/static/images/tb95/onion-na...@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-upd...@2x.png | Bin 0 -> 108234 bytes .../png/TBAa-onboarding.png| Bin 58890 -> 54696 bytes .../png/tbaa-onboard...@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
[tor-commits] [tpo/staging] Merge branch 'master' into master
commit b7d1e5f56e83827b539cad1a3fe3584c745c4152 Merge: 59a96c3 a0931ab Author: Antonela Date: Fri Apr 26 10:07:31 2019 -0300 Merge branch 'master' into master content/about/people/boklm/contents.lr| 2 +- content/about/people/ewyatt/contents.lr | 2 +- content/about/people/sajolida/contents.lr | 2 +- content/menu/contents.lr | 16 templates/download-options.html | 1 - templates/download-tor.html | 21 +++-- 6 files changed, 38 insertions(+), 6 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Merge branch 'master' into master
commit 7918445fe7278ed0d932d14fa8adc30ba9c770a5 Merge: cdf2cea 028a442 Author: Antonela Date: Wed Mar 27 11:48:24 2019 -0300 Merge branch 'master' into master .htaccess | 6 +++--- content/about/sponsors/DARPA-penn/contents.lr | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --cc content/about/sponsors/DARPA-penn/contents.lr index d93001f,ffcf88e..dd73dca --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/content/about/sponsors/DARPA-penn/contents.lr @@@ -16,4 -16,4 +16,4 @@@ link: https://www.darpa.mil/program/ext --- description: - DARPA's Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contracts supports our work addressing denial of service attacks on free and open communication on the internet. -DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contract supports our work addressing denial of service attacks on free and open communication on the internet. ++DARPAâs Extreme DDoS Defense (XD3) program focuses on three broad areas of opportunity to improve resilience against DDoS attacks and aims to thwart DDoS attacks. This contract supports our work addressing denial of service attacks on free and open communication on the internet. ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
[tor-commits] [tpo/staging] Merge branch 'master' into master
commit e54786e39077a7901f4587854316a690b7feb7f1 Merge: 3a52e28 780e6eb Author: Antonela Date: Thu Feb 7 16:11:44 2019 +0200 Merge branch 'master' into master .../about/jobs/backend-engineer-ooni/contents.lr | 5 ++ content/about/jobs/browser-developer/contents.lr | 6 +++ .../press/boing-boing-charitable-guide/contents.lr | 18 +++ content/press/contents.lr | 2 + content/press/new-release-tails/contents.lr| 18 +++ content/press/new-release-tor-browser/contents.lr | 18 +++ content/press/new-release-tor/contents.lr | 16 ++ .../tor-pulls-in-record-donations/contents.lr | 18 +++ content/press/wired-tor-easier/contents.lr | 18 +++ content/press/wired-tor-safer-sex/contents.lr | 18 +++ databags/download-alternatives.ini | 11 models/post.ini| 59 ++ models/press.ini | 33 templates/download-languages.html | 2 +- templates/download-options.html| 2 +- templates/macros/downloads.html| 4 +- templates/macros/jobs.html | 5 +- templates/macros/press.html| 19 +++ templates/post.html| 1 + templates/press.html | 52 --- 20 files changed, 277 insertions(+), 48 deletions(-) ___ tor-commits mailing list tor-commits@lists.torproject.org https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
