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

[tpo/staging] Update to press model
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit bf7cf5d62f3ee63e89bfc14ce5becb4c96c3b950 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 10:40:53 2019 +0100 Update to press model --- models/press.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/press.ini b/models/press.ini index 0f6af59..c3c4dca 100644 --- a/models/press.ini +++ b/models/press.ini @@ -1,8 +1,8 @@ [model] name = Press label = {{ this.title }} -hidden = no discoverable = yes +hidden = no [fields.title] label = Title

1 0

[tpo/staging] add forward for trademark faq
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 0b03e470c434173d278a0b7e870246fc52457661 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Mar 27 11:18:08 2019 +0100 add forward for trademark faq --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index bdf2262..d0360c6 100644 --- a/.htaccess +++ b/.htaccess @@ -8,6 +8,7 @@ RewriteRule ^docs/documentation(.*) https://2019.www.torproject.org/docs/documen RewriteRule ^docs/verifying-signatures(.*) https://2019.www.torproject.org/docs/verifying-signatures$1 [R=302,L] RewriteRule ^docs/signing-keys(.*) https://2019.www.torproject.org/docs/signing-keys$1 [R=302,L] RewriteRule ^docs/tor-manual(.*) https://2019.www.torproject.org/docs/tor-manual$1 [R=302,L] +RewriteRule ^docs/trademark-faq(.*) https://2019.www.torproject.org/docs/trademark-faq$1 [R=302,L] # Torbutton RewriteRule ^torbutton/design(.*) https://2019.www.torproject.org/docs/torbutton/en/design$1 [R=302,L]

1 0

[tpo/staging] fix typo at sponsors page
by emmapeel＠torproject.org 06 Apr '19

06 Apr '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/staging] fix typo at sponsors page
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 1711d13c0deb93c059f809d88d1b0ead612923c3 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 1916f4d..ffcf88e 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 contract 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/staging] Update torbrowser redirect
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 028a442252dc071df602438f8ce9e0fb30abe1b6 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 14:30:17 2019 +0100 Update torbrowser redirect --- .htaccess | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index ad89b40..957f887 100644 --- a/.htaccess +++ b/.htaccess @@ -16,8 +16,7 @@ RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R # Tor Browser RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] -#RewriteRule ^torbrowser/$ /projects/torbrowser.html.en [R=301,L] -RewriteRule ^torbrowser(.*) /projects/torbrowser.html.en [R=301,L] +RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser [R=301,L] # tordnsel RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L]

1 0

[tpo/staging] add twitter:image
by emmapeel＠torproject.org 06 Apr '19

06 Apr '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/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 7186e56da51f716d20666409f0ee0816d69c2242 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:07:02 2019 +0100 Update htaccess --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 957f887..2d6528e 100644 --- a/.htaccess +++ b/.htaccess @@ -1,5 +1,8 @@ RewriteEngine On +# about +RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] + # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L] RewriteRule ^docs/bridges(.*) https://2019.www.torproject.org/docs/bridges$1 [R=302,L]

1 0

[tpo/staging] Merge branch 'master' into master
by emmapeel＠torproject.org 06 Apr '19

06 Apr '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/staging] Update htaccess
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 68f1a1643a6d07ca35736fdadb87453961cba1cf Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:09:43 2019 +0100 Update htaccess --- .htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.htaccess b/.htaccess index 2d6528e..3301643 100644 --- a/.htaccess +++ b/.htaccess @@ -21,6 +21,7 @@ RewriteRule ^torbutton/(.*) https://2019.www.torproject.org/docs/torbutton/$1 [R RewriteRule ^torbrowser/dist/(.*) /dist/torbrowser/$1 [R=301,L] RewriteRule ^torbrowser(.*) https://2019.www.torproject.org/projects/torbrowser [R=301,L] + # tordnsel RewriteRule ^tordnsel/dist/(.*) https://2019.www.torproject.org/dist/tordnsel/$1 [R=301,L] @@ -29,6 +30,8 @@ RewriteRule ^overview(.*) /about/history$1 [R=301,L] # Projects RewriteRule ^projects/torbrowser/design(.*) https://2019.www.torproject.org/projects/torbrowser/design/ [R=302,L] +RewriteRule ^projects/torbrowser/RecommendedTBBVersions ttps://2019.www.torproject.org/projects/torbrowser/RecommendedTBBVersions [R=302,L] +RewriteRule ^projects/torbrowser(.*) /download$1 [R=302,L] RewriteRule ^projects/$ https://2019.www.torproject.org/projects/projects [R=302,L] #Pluggable Transports

1 0

[tpo/staging] Update download apk link
by emmapeel＠torproject.org 06 Apr '19

06 Apr '19

commit 612590aabc3cef74c514b2393763fab9f741b854 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:11:13 2019 +0100 Update download apk link --- templates/download-android.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/download-android.html b/templates/download-android.html index 9564b88..5008e5d 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -15,7 +15,7 @@ <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> <div class="row my-5"> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="">{{ _('Download .apk') }}</a> + <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }}</a> <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> {% from "macros/downloads.html" import render_fdroid %} <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a>

1 0