- tor-commits - lists.torproject.org

[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

[tpo/master] Add download link for tor source
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 0b2527402325b4aed8c1bdc0b1daa1eb2853e193 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 18:13:11 2019 +0100 Add download link for tor source --- databags/versions.ini | 2 +- templates/hero-download.html | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index cbb9a5c..cbba14e 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -11,7 +11,7 @@ release_date = 2019-03-25 version = maint-8.0 [tor-stable] -version = 0.3.5.7 +version = 0.3.5.8 [tor-alpha] version = 0.4.0.1-alpha diff --git a/templates/hero-download.html b/templates/hero-download.html index 6f31fd0..90980e5 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -37,6 +37,9 @@ <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> + {% set v = bag('versions', 'tor-stable') %} + {% set download_source = 'https://dist.torproject.org/tor-' + v.version + '.tar.gz' %} + <a class="mx-auto text-white py-3" href="{{ download_source }}"><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] Update htaccess
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 2f1e2819904f578107da9fb158905cf0967f64a7 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 17:15:44 2019 +0100 Update htaccess --- .htaccess | 3 +++ templates/macros/people.html | 1 + 2 files changed, 4 insertions(+) diff --git a/.htaccess b/.htaccess index 2ff0d64..6987237 100644 --- a/.htaccess +++ b/.htaccess @@ -60,6 +60,9 @@ RewriteRule ^support(.*) https://support.torproject.org [R=301,L] # Newsletter RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=301,L] +# Press +RewriteRule ^press/press(.*) /press [R=302,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=301,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] diff --git a/templates/macros/people.html b/templates/macros/people.html index 22b0121..18e3285 100644 --- a/templates/macros/people.html +++ b/templates/macros/people.html @@ -18,6 +18,7 @@ {% if item.image %} <picture> <img src="{{ item.image|asseturl }}" class="rounded-circle float-left image-thumb" alt="{{ item.nickname }}"> + </picture> {% else %} <img src="{{ '/static/images/people/no_photo.png'|asseturl }}" class="rounded-circle float-left image-thumb" alt="no-photo"> {% endif %}

1 0

[tpo/master] Update htaccess
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit b2f1c0d69cf225924e0694a31ee4899fd6b8497e Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:15:05 2019 +0100 Update htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 9a2d6dc..2ff0d64 100644 --- a/.htaccess +++ b/.htaccess @@ -3,6 +3,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] +RewriteRule ^about/sponsors(.*) /about/sponsors$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]

1 0

[tpo/master] Update htaccess
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 0d48b7f77d9c199140a2199542bd05053f5849de Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:13:37 2019 +0100 Update htaccess --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index 1f9e891..9a2d6dc 100644 --- a/.htaccess +++ b/.htaccess @@ -2,6 +2,7 @@ RewriteEngine On # about RewriteRule ^about/corepeople(.*) /about/people$1 [R=302,L] +RewriteRule ^about/financials(.*) /about/reports$1 [R=302,L] # moved to /docs/ RewriteRule ^docs/faq(.*) https://2019.www.torproject.org/docs/faq$1 [R=302,L]

1 0