- tor-commits - lists.torproject.org

[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

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

27 Mar '19

commit 0688808a33ed5daf20a919b142dbb80d2f0a3107 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 16:12:09 2019 +0100 Update htaccess --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 3301643..1f9e891 100644 --- a/.htaccess +++ b/.htaccess @@ -73,7 +73,7 @@ RewriteRule ^download/download-easy(.*) /download [R=302,L] RewriteRule ^relays(.*) https://2019.www.torproject.org/getinvolved/relays [R=301,L] # Index Pages -RewriteRule ^about/overview(.*) https://2019.www.torproject.org/about/overview$1 [R=302,L] +RewriteRule ^about/overview(.*) /about/history$1 [R=302,L] RewriteRule ^about/$ /about/history [R=302,L] # Donation campaign

1 0

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

27 Mar '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

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

27 Mar '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/master] Update htaccess
by hiro＠torproject.org 27 Mar '19

27 Mar '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