March 2019 - tor-commits - lists.torproject.org

[tpo/master] Localize social media cards
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit b97ff2a8a83a137d781feb3e6942c66deb849682 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:41:21 2019 +0100 Localize social media cards --- templates/meta.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/meta.html b/templates/meta.html index 206dd76..adb2653 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -2,7 +2,7 @@ <html xmlns="http://www.w3.org/1999/xhtml" {% if bag('alternatives', this.alt, 'direction') == 'text-right' %}dir="rtl"{% endif %}> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1"> -<meta name="description" content="Defend yourself against tracking and surveillance. Circumvent censorship."> +<meta name="description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.')" }}> <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" />

1 0

[tpo/master] fix typo at sponsors page
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 3d757dbd8805614d006a65c2ffdf567608ff260b Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 09:15:27 2019 -0300 fix typo at sponsors page --- content/about/sponsors/DARPA-penn/contents.lr | 2 +- content/about/sponsors/otf/contents.lr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/DARPA-penn/contents.lr b/content/about/sponsors/DARPA-penn/contents.lr index 78ea646..3e70de1 100644 --- a/content/about/sponsors/DARPA-penn/contents.lr +++ b/content/about/sponsors/DARPA-penn/contents.lr @@ -16,4 +16,4 @@ link: https://www.darpa.mil/program/extreme-ddos-defense --- 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 grant 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 contracts supports our work addressing denial of service attacks on free and open communication on the internet. diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index 453d8cc..4fb9cd5 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -16,4 +16,4 @@ link: https://www.opentech.fund/ --- description: -OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These grants were used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement. +OTF strives to support technology-centric solutions for anyone affected by censorship, surveillance, and internet blocking in order to protect fundamental human rights. These contracts were used to further our work observing and responding to internet censorship around the world and also to help improve transparency and credibility in Tor metrics and measurement.

1 0

[tpo/master] Merge branch 'master' of https://github.com/holantonela/tpo
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit be8f16e7b045b1b8b6ce2626f1f127a7ed9db916 Merge: 3d757db 7eb6c98 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 09:16:29 2019 -0300 Merge branch 'master' of https://github.com/holantonela/tpo .htaccess | 43 +- assets/static/fonts/SourceSansPro/OFL.txt | 2 +- assets/static/keys/moritz.txt | 4157 +++----------------- configs/i18n.ini | 2 +- content/about/history/contents.lr | 18 +- .../about/jobs/backend-engineer-ooni/contents.lr | 8 +- content/about/jobs/browser-developer/contents.lr | 2 +- content/about/jobs/contents.lr | 2 +- .../jobs/developer-data-architect/contents.lr | 8 +- .../jobs/senior-system-administrator/contents.lr | 8 +- content/about/people/biella/contents.lr | 2 +- content/about/people/boklm/contents.lr | 2 + content/about/people/cindy/contents.lr | 2 +- content/about/people/ewyatt/contents.lr | 2 + content/about/people/ohmygodel/contents.lr | 2 +- content/about/people/pospeselr/contents.lr | 2 + content/about/people/sajolida/contents.lr | 2 + content/about/people/ssteele/contents.lr | 2 +- content/about/sponsors/DARPA-nrl/contents.lr | 2 +- content/about/sponsors/DARPA-penn/contents.lr | 2 +- .../about/sponsors/USSD-DHRL-harvard/contents.lr | 2 +- content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/imls-ny/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 +- content/about/sponsors/ncf/contents.lr | 2 +- content/about/sponsors/nsf-rochester/contents.lr | 2 +- content/about/sponsors/sida/contents.lr | 2 +- .../15-great-free-privacy-downloads/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../blogging-where-speech-isn-t-free/contents.lr | 2 +- .../contents.lr | 5 +- .../contents.lr | 2 +- .../contents.lr | 2 +- content/press/contents.lr | 8 +- .../contents.lr | 5 +- .../contents.lr | 5 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 5 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../press/future-tense-the-deep-web/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../how-to-manage-your-web-footprint/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- content/press/new-release-tails/contents.lr | 2 - content/press/new-release-tor-browser/contents.lr | 2 - content/press/new-release-tor/contents.lr | 2 - .../nsa-targets-the-privacy-conscious/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 5 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../the-fp-top-100-global-thinkers/contents.lr | 5 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- content/press/tor-is-still-safe/contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 2 +- .../contents.lr | 5 +- .../contents.lr | 5 +- .../contents.lr | 2 +- .../contents.lr | 2 +- content/thank-you/contents.lr | 2 +- models/blog-post.ini | 29 - models/blog.ini | 16 - models/post.ini | 1 - models/press.ini | 1 - templates/contact.html | 2 +- templates/download.html | 4 +- templates/home.html | 4 +- templates/jobs.html | 2 +- templates/people.html | 2 +- templates/projects.html | 2 +- 99 files changed, 608 insertions(+), 3895 deletions(-) diff --cc content/about/sponsors/DARPA-penn/contents.lr index 3e70de1,1916f4d..d93001f --- 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 grant 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 contracts supports our work addressing denial of service attacks on free and open communication on the internet.

1 0

[tpo/master] add twitter:image
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit cdf2cea62894c1cfab5c2061df4e3c3be3d402de Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 11:47:32 2019 -0300 add twitter:image --- templates/meta.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/meta.html b/templates/meta.html index 0bf3d3f..206dd76 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -6,6 +6,7 @@ <meta name="twitter:card" content="summary" /> <meta name="twitter:site" content="@torproject" /> <meta name="twitter:creator" content="@torproject" /> +<meta name="twitter:image:src" content="{{ '/static/images/tor-project-logo-onions.png'|asseturl }}"/> <meta property="og:url" content="https://torproject.org" /> <meta property="og:title" content="The Tor Project | Privacy & Freedom Online" /> <meta property="og:description" content="Defend yourself against tracking and surveillance. Circumvent censorship." />

1 0

[tpo/master] Merge pull request #12 from torproject/master
by hiro＠torproject.org 27 Mar '19

27 Mar '19

1 0

[tpo/master] Merge branch 'master' into master
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 7918445fe7278ed0d932d14fa8adc30ba9c770a5 Merge: cdf2cea 028a442 Author: Antonela <hola(a)antonela.me> 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.

1 0

[tpo/master] Merge pull request #13 from torproject/master
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 32863000150d73d1bf195f1952c013d1c3fe4195 Merge: 7918445 2f1e281 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:05:24 2019 -0300 Merge pull request #13 from torproject/master rebase .htaccess | 13 ++++++++++++- templates/download-android.html | 2 +- templates/macros/people.html | 1 + 3 files changed, 14 insertions(+), 2 deletions(-)

1 0

[tpo/master] fix people's page link to list
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 086b43009437f53e65a19a0131b36bec20f68a17 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:29:58 2019 -0300 fix people's page link to list --- templates/people.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/people.html b/templates/people.html index fba0466..abb3818 100644 --- a/templates/people.html +++ b/templates/people.html @@ -27,8 +27,8 @@ <div class="row justify-content-center"> <h4 class="text-primary display-5">{{ _('Join Our Team') }}</h4> <p class="text-center">{{ _("Even if we aren't hiring, you can contribute to Tor. We are open to ideas and studies to improve Tor software. If you're a developer, we welcome you to sign up for our dev mailing list to see what we're up to.") }}</p> - <button class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> + <a class="btn btn-lg btn-outline-primary mr-2" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev"> {{ _("Sign up for tor-dev") }}<i class="oi oi-arrow-right pl-3" title="icon arrow-right" aria-hidden="true"></i> - </button> + </a> </div> </div>

1 0

[tpo/master] add download tarball link
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 12a7f86aedc9a59acd1252e9c3deefe43f1d5b45 Author: Antonela <hola(a)antonela.me> Date: Wed Mar 27 14:08:06 2019 -0300 add download tarball link --- templates/hero-download.html | 1 + 1 file changed, 1 insertion(+) diff --git a/templates/hero-download.html b/templates/hero-download.html index 6f31fd0..e71878b 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -37,6 +37,7 @@ <div class="row p-5"> <a class="mx-auto text-white py-3" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language') }}</u></a> <a class="mx-auto text-white py-3" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Advanced Install Options') }}</u></a> + <a class="mx-auto text-white py-3" href=""><u>{{ _('Download Source Tarball') }}</u></a> </div> <div class="hidden-sm row p-5 justify-content-center window-bg"> <a class="mx-auto text-white text-center py-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a>

1 0

[tpo/master] Merge and update
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit cbb891e76ec0f877764927f67dde495f8373a7f1 Merge: 0b25274 086b430 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:32:28 2019 +0100 Merge and update content/about/sponsors/DARPA-penn/contents.lr | 2 +- templates/meta.html | 1 + templates/people.html | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-)

1 0