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

[tpo/staging] Bug 32223: Add the ro locale for Tor Browser stable downloads
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit a7741370d2d6f415577003478f32d6f8367aa3e9 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 23 11:06:46 2019 +0200 Bug 32223: Add the ro locale for Tor Browser stable downloads --- databags/download-alternatives.ini | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index 752985e..2ccb7d4 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -98,6 +98,10 @@ language = Polszczyzna (pl) url = /pt-BR/ language = Português Brasil(pt-BR) +[ro] +url = /ro/ +language = Română (ro) + [ru] language = Русский (ru) url = /ru/

1 0

[tpo/staging] Merge remote-tracking branch 'LilyLME/patch-2'
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit f35a2eb025572f6413895f71d9b11db50f90729a Merge: 5800c9b 7a6324d Author: emma peel <emma.peel(a)riseup.net> Date: Thu Oct 24 08:29:00 2019 +0200 Merge remote-tracking branch 'LilyLME/patch-2' content/about/history/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tpo/staging] Bug 32222: Change order of Android downloads
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit aef3b67ab3a920e85be07051130ccbc4409cc89f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 23 11:10:23 2019 +0200 Bug 32222: Change order of Android downloads Put aarch64 first, then armv7 and x86. Also add spaces between them. --- templates/download-android.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index cfc933b..f97e8db 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -17,12 +17,15 @@ <div class="row my-5"> <div class="col-xl-6 mx-auto text-center"> {% set t = bag('versions', 'torbrowser-stable') %} + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} aarch64</a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc">sig</a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} arm</a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc">sig</a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} x86</a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc">sig</a> - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} aarch64</a> - <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc">sig</a> + <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser">{{ _('Go to Google Play') }}</a> {% from "macros/downloads.html" import render_fdroid %} <a class="btn btn-block btn-lg btn-light text-primary my-2" href="https://support.torproject.org/tormobile/tormobile-7/">{{ _('Go to F-Droid') }}</a>

1 0

[tpo/staging] Bug 32222: Add Android x86_64 download link to Tor Browser download page
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit f9e8f1bc9753837d4169280cd6a0dbb53d441b74 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 23 11:13:52 2019 +0200 Bug 32222: Add Android x86_64 download link to Tor Browser download page --- templates/download-android.html | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/download-android.html b/templates/download-android.html index f97e8db..bcb8fcc 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -23,6 +23,9 @@ <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} arm</a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc">sig</a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }} x86_64</a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk.asc">sig</a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} x86</a> <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc">sig</a>

1 0

[tpo/staging] Remove 8.5.5 from RecommendedTBBVersions
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 680c8318fdd2215f1dd200f569ee3752f499e626 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 23 22:25:42 2019 +0200 Remove 8.5.5 from RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ---- 1 file changed, 4 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 2b6e4a4..fd2f6ea 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,10 +5,6 @@ _template: empty.html body: [ -"8.5.5", -"8.5.5-MacOS", -"8.5.5-Linux", -"8.5.5-Windows", "9.0", "9.0-MacOS", "9.0-Linux",

1 0

[tpo/staging] Tor 0.4.2.3-alpha is released.
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 6e788f04c3de683a5f11e50f4a1acc4f7adbb66b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Oct 24 15:51:59 2019 -0400 Tor 0.4.2.3-alpha is released. --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 3141f67..ea163b3 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -9,5 +9,5 @@ version = 9.5a1 version = 0.4.1.6 [tor-alpha] -version = 0.4.2.2-alpha +version = 0.4.2.3-alpha

1 0

[tpo/staging] Add new Tor Browser version: 9.5a1
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 5800c9bf0b3bf7356e868ae5f8e3dbb10cebea1a Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Oct 23 22:27:34 2019 +0200 Add new Tor Browser version: 9.5a1 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index fd2f6ea..f6c908a 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -20,5 +20,9 @@ body: "9.0a8", "9.0a8-MacOS", "9.0a8-Linux", -"9.0a8-Windows" +"9.0a8-Windows", +"9.5a1", +"9.5a1-MacOS", +"9.5a1-Linux", +"9.5a1-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 721e04e..3141f67 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.0 win32 = 0.4.1.6 [torbrowser-alpha] -version = 9.0a8 +version = 9.5a1 [tor-stable] version = 0.4.1.6

1 0

[tpo/staging] Add donate redirect
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit ee50888eae7c9dcab044ec1a5a44adef44b8b4ae Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 21:26:07 2019 +0200 Add donate redirect --- .htaccess | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.htaccess b/.htaccess index 0c1655a..2655a40 100644 --- a/.htaccess +++ b/.htaccess @@ -70,6 +70,10 @@ RewriteRule ^newsletter(.*) https://newsletter.torproject.org [R=302,L] # Press RewriteRule ^press/press(.*) /press [R=302,L] +# Donation campaign +# 2019 +RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] + # other (feel free to categorize) RewriteRule ^people(.*) /about/people$1 [R=302,L] RewriteRule ^donate$ https://donate.torproject.org [R=302,L] @@ -97,10 +101,6 @@ RewriteRule ^eff/(.*) https://2019.www.torproject.org/eff/$1 [R=302,L] # Videos RewriteRule ^videos/(.*) https://2019.www.torproject.org/videos/$1 [R=302,L] -# Donation campaign -# 2019 -RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] - # Donation campaign # 2017

1 0

[tpo/staging] Update .htaccess - fix typo
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 10c7c2c47b144afb044ca237e3f972d81db433af Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 22:08:02 2019 +0200 Update .htaccess - fix typo --- .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 8762a85..2dddde2 100644 --- a/.htaccess +++ b/.htaccess @@ -72,7 +72,7 @@ RewriteRule ^press/press(.*) /press [R=302,L] # Donation campaign # 2019 -RewriteRule ^donate(.*) https://donate.torproject.org [R=302, L] +RewriteRule ^donate(.*) https://donate.torproject.org [R=302,L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] # other (feel free to categorize)

1 0

[tpo/staging] Update htaccess
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 06cd798815b8659cf70b65a1b9764ed402eda32c Author: hiro <hiro(a)torproject.org> Date: Fri Oct 25 22:03:34 2019 +0200 Update htaccess --- .htaccess | 1 + lego | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.htaccess b/.htaccess index 2655a40..8762a85 100644 --- a/.htaccess +++ b/.htaccess @@ -72,6 +72,7 @@ RewriteRule ^press/press(.*) /press [R=302,L] # Donation campaign # 2019 +RewriteRule ^donate(.*) https://donate.torproject.org [R=302, L] RewriteRule ^donate/$ https://donate.torproject.org [R=302,L] # other (feel free to categorize) diff --git a/lego b/lego index 09c5813..37611e7 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit 37611e7cfae397d5e8a8aa41ac219a41ae2b6181

1 0