September 2020 - tor-commits - lists.torproject.org

[tpo/staging] Add new Tor Browser version 10.0
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit ea80dd24e96372128550a51c3ff2ce8e77d5d7b6 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Sep 22 20:31:11 2020 +0000 Add new Tor Browser version 10.0 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index d0a3a6ff..26982381 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -13,6 +13,10 @@ body: "9.5.4-MacOS", "9.5.4-Linux", "9.5.4-Windows", +"10.0", +"10.0-MacOS", +"10.0-Linux", +"10.0-Windows", "10.0a5", "10.0a5-MacOS", "10.0a5-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 4cb55e68..fc1612a1 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.5.4 +version = 10.0 win32 = 0.4.3.6 [torbrowser-android-stable]

1 0

[tpo/staging] Add new Tor Browser version 10.5a1
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit d77764ac51185ef17a035b80b98493ca150d002d Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu Sep 24 19:04:30 2020 +0000 Add new Tor Browser version 10.5a1 And correct stable win32 version number --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 26982381..790dfc1f 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -28,5 +28,9 @@ body: "10.0a7", "10.0a7-MacOS", "10.0a7-Linux", -"10.0a7-Windows" +"10.0a7-Windows", +"10.5a1", +"10.5a1-MacOS", +"10.5a1-Linux", +"10.5a1-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index fc1612a1..0f6811f1 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,12 +1,12 @@ [torbrowser-stable] version = 10.0 -win32 = 0.4.3.6 +win32 = 0.4.4.5 [torbrowser-android-stable] version = 9.5.4 [torbrowser-alpha] -version = 10.0a7 +version = 10.5a1 [torbrowser-android-alpha] version = 10.0a6

1 0

[tpo/staging] Merge branch 'master' into staging
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 45123e59b8c14283a70da516d97e2c97a79d8647 Merge: 69473b8b c66efabb Author: hiro <hiro(a)torproject.org> Date: Sun Sep 27 19:12:06 2020 +0200 Merge branch 'master' into staging .htaccess | 241 +++++++++++++++++++++ .htaccess-membership | 4 - README.md | 5 +- assets/static/images/membership/logos/Avast.png | Bin 78009 -> 0 bytes .../static/images/membership/logos/MullvadVPN.png | Bin 21976 -> 0 bytes .../static/images/membership/logos/MullvadVPN.svg | 197 ----------------- assets/static/images/membership/logos/avast.png | Bin 0 -> 25859 bytes assets/static/images/membership/logos/cymru.png | Bin 0 -> 32671 bytes assets/static/images/membership/logos/mullvad.png | Bin 0 -> 28521 bytes content/about/membership/contents.lr | 2 +- content/about/people/ahf/contents.lr | 4 +- content/about/people/biella/contents.lr | 2 - content/about/people/julius/contents.lr | 4 +- content/about/people/komlo-core/contents.lr | 19 ++ content/about/people/komlo/contents.lr | 12 +- content/about/people/matt/contents.lr | 2 - content/about/people/megan/contents.lr | 18 -- .../about/people/rabbi-rob-thomas-core/contents.lr | 17 ++ content/about/people/rabbi-rob-thomas/contents.lr | 10 +- content/about/people/ssteele/contents.lr | 17 -- .../torbrowser/RecommendedTBBVersions/contents.lr | 44 ++-- content/releases/tor-browser-10-0/contents.lr | 26 +++ databags/about.ini | 5 +- databags/download-alternatives-alpha.ini | 2 +- databags/download-alternatives.ini | 2 +- databags/versions.ini | 12 +- templates/hero-download.html | 2 +- templates/membership.html | 44 ++-- templates/privchat.html | 52 ++--- 29 files changed, 401 insertions(+), 342 deletions(-) diff --cc templates/hero-download.html index acc7d869,df940e2b..4199e954 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@@ -52,5 -53,9 +52,5 @@@ <div class="row bg-darker my-5 p-3 rounded"> {% from "macros/downloads.html" import render_tor_browser_blog_post %} - <h5 class="mx-auto text-white text-center my-0"><i class="text-light fas fa-exclamation-circle text-warning px-2"></i>{{ _('Disabling Javascript: Please read the latest %s for more information.') |format(render_tor_browser_blog_post())| safe }}</h5> + <h5 class="mx-auto text-white text-center my-0"><i class="text-light fas fa-exclamation-circle text-warning px-2"></i>{{ _('Android Tor Browser 10 is under active development. Watch for its release in the coming weeks.') }}</h5> </div> - -<div class="hidden-sm row p-md-5 justify-content-center window-bg"> - <a class="mx-auto text-white text-center py-md-5" href="https://blog.torproject.org/category/tags/tor-browser"><u>{{ _('Read the latest release announcements') }}</u></a> -</div>

1 0

[tpo/staging] Fix typos, move host to the top, fixed yt link
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 7fc37edf6937a18afe5cf814f0b1fbd39125e8ae Author: antonela <antonela(a)torproject.org> Date: Mon Aug 24 09:37:11 2020 -0300 Fix typos, move host to the top, fixed yt link --- templates/privchat.html | 49 +++++++++++++++++++++++++------------------------ 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/templates/privchat.html b/templates/privchat.html index 91e49632..d5de746e 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -25,7 +25,7 @@ <div class="container py-3 mt-5"> <p class="h2 text-primary" target="_blank">Chapter #2 - the Good, the Bad, and the Ugly of Censorship Circumvention <div> - <p><span class="text-primary nick" style="font-size:18px;"><mark>August 28th ∙ 10:00 AM Pacific Time ∙ 17:00 UTC ∙ 13:00 Eastern Time ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> + <p><span class="text-primary nick" style="font-size:18px;"><mark>August 28th ∙ 10:00 AM Pacific Time ∙ 17:00 UTC ∙ 13:00 Eastern Time ∙ <a href="https://youtu.be/aOOChyMCZH4" title="Tor Project You Tube Channel" target="_blank"><i class="fab fa-youtube"></i> @torproject YouTube channel</a></mark></span></p> </div> <a class="btn btn-small bg-primary text-light my-4" href="https://youtu.be/aOOChyMCZH4" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> <div> @@ -36,7 +36,29 @@ </div> <div class="container pt-5 justify-content-center"> - <h4>Participants</h4> + + <h4>Host</h4> + + <div class="row"> + <div class="container"> + <div class="card flex-row flex-wrap py-3"> + <div class="col-3"> + <img class="card-img-top" src="{{ '/static/images/privchat/cory.png' }}" alt=""> + </div> + <div class="col"> + <div class="card-block px-2"> + <div class="pb-4"> + <h4 class="display-4 text-primary">Cory Doctorow</h4> + <strong class="display-5 text-primary mb-4">Electronic Frontier Foundation, MIT</strong> + </div> + <p class="text-tpo"><a href="https://craphound.com" target="_blank" title="Cory Doctorow">Cory Doctorow</a> is a science fiction author, activist, and journalist. He is the author of RADICALIZED and WALKAWAY, science fiction for adults, a YA graphic novel called IN REAL LIFE, the nonfiction business book INFORMATION DOESN’T WANT TO BE FREE, and young adult novels like HOMELAND, PIRATE CINEMA and LITTLE BROTHER. His latest book is POESY THE MONSTER SLAYER, a picture book for young readers. His next book is ATTACK SURFACE, an adult sequel to LITTLE BROTHER. He maintains a daily blog at Pluralistic.net. He works for the Electronic Frontier Foundation, is a MIT Media Lab Research Affiliate, is a Visiting Professor of Computer Science at Open University, a Visiting Professor of Practice at the University of North Carolina’s School of Library and Information Science and co-founded the UK Open Rights Group. Born in Toronto, Canada, he now lives in Los Angeles.</p> + </div> + </div> + </div> + </div> + </div> + + <h4 class="mt-5">Participants</h4> <div class="row"> <div class="container"> @@ -103,27 +125,6 @@ </div> </div> - <h4>Host</h4> - - <div class="row"> - <div class="container"> - - <div class="card flex-row flex-wrap py-3"> - <div class="col-3"> - <img class="card-img-top" src="{{ '/static/images/privchat/cory.png' }}" alt=""> - </div> - <div class="col"> - <div class="card-block px-2"> - <div class="pb-4"> - <h4 class="display-4 text-primary">Cory Doctorow</h4> - <strong class="display-5 text-primary mb-4">Electronic Frontier Foundation, MIT</strong> - </div> - <p class="text-tpo"><a href="https://craphound.com" target="_blank" title="Cory Doctorow">Cory Doctorow</a> is a science fiction author, activist, and journalist. He is the author of RADICALIZED and WALKAWAY, science fiction for adults, a YA graphic novel called IN REAL LIFE, the nonfiction business book INFORMATION DOESN’T WANT TO BE FREE, and young adult novels like HOMELAND, PIRATE CINEMA and LITTLE BROTHER. His latest book is POESY THE MONSTER SLAYER, a picture book for young readers. His next book is ATTACK SURFACE, an adult sequel to LITTLE BROTHER. He maintains a daily blog at Pluralistic.net. He works for the Electronic Frontier Foundation, is a MIT Media Lab Research Affiliate, is a Visiting Professor of Computer Science at Open University, a Visiting Professor of Practice at the University of North Carolina’s School of Library and Information Science and co-founded the UK Open Rights Group. Born in Toronto, Canada, he now lives in Los Angeles.</p> - </div> - </div> - </div> - - </div> <div class="container"> @@ -143,7 +144,7 @@ <img class="card-img-top mb-5" src="{{ '/static/images/privchat/privchat1-cover.png' }}" alt="PrivChat with Tor"> <p class="h2 text-primary" target="_blank">Chapter #1 - Online Privacy in 2020: Activism & COVID-19</p> <div> - <p><span class="text-primary nick"><mark>With Carmela Troncoso, Daniel Kahn Gillmor and Matt Michell. Hosted by Roger Dingledine.</mark></span></p> + <p><span class="text-primary nick"><mark>With Carmela Troncoso, Daniel Kahn Gillmor and Matt Mitchell. Hosted by Roger Dingledine.</mark></span></p> </div> <a class="btn btn-small bg-primary text-light mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fab fa-youtube"></i>Watch</a> <div>

1 0

[tpo/staging] Add new Tor Browser version 9.5.4 (Android)
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 099a4f3328503b1afe41d344e4bd1bb2e2ea4d7a Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 26 23:34:18 2020 +0000 Add new Tor Browser version 9.5.4 (Android) --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 110594a5..9bd371a5 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.5.4 win32 = 0.4.3.6 [torbrowser-android-stable] -version = 9.5.3 +version = 9.5.4 [torbrowser-alpha] version = 10.0a5

1 0

[tpo/staging] Add new Tor Browser version 10.0a6
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit bc9906a2328b25cba4acdf0f789fbd06d5f40ac8 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 26 23:34:49 2020 +0000 Add new Tor Browser version 10.0a6 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index da51d7a0..a7f2b73d 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -36,5 +36,9 @@ body: "10.0a5", "10.0a5-MacOS", "10.0a5-Linux", -"10.0a5-Windows" +"10.0a5-Windows", +"10.0a6", +"10.0a6-MacOS", +"10.0a6-Linux", +"10.0a6-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 9bd371a5..3755b877 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,10 +6,10 @@ win32 = 0.4.3.6 version = 9.5.4 [torbrowser-alpha] -version = 10.0a5 +version = 10.0a6 [torbrowser-android-alpha] -version = 10.0a4 +version = 10.0a6 [tor-stable] version = 0.4.3.6

1 0

[tpo/staging] Add new Tor Browser version 9.5.4
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit a4246a529c285f5c91cfc0a38d85798871e52660 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Aug 25 17:05:22 2020 +0000 Add new Tor Browser version 9.5.4 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 4 ++++ databags/versions.ini | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index c0cb7d8c..da51d7a0 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -17,6 +17,10 @@ body: "9.5.3-MacOS", "9.5.3-Linux", "9.5.3-Windows", +"9.5.4", +"9.5.4-MacOS", +"9.5.4-Linux", +"9.5.4-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index e1e162fd..110594a5 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.5.3 +version = 9.5.4 win32 = 0.4.3.6 [torbrowser-android-stable]

1 0

[tpo/staging] Deprecate old Tor Browser version
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 781630f27d6deb6b20f6d0ec6b8a3dd78f58fc45 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Aug 26 23:37:18 2020 +0000 Deprecate old Tor Browser version 9.5, 9.5.1, 10.0a1, 10.0a2, 10.0a4) --- .../torbrowser/RecommendedTBBVersions/contents.lr | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index a7f2b73d..57cd0ea3 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,14 +5,6 @@ _template: empty.html body: [ -"9.5", -"9.5-MacOS", -"9.5-Linux", -"9.5-Windows", -"9.5.1", -"9.5.1-MacOS", -"9.5.1-Linux", -"9.5.1-Windows", "9.5.3", "9.5.3-MacOS", "9.5.3-Linux", @@ -21,18 +13,6 @@ body: "9.5.4-MacOS", "9.5.4-Linux", "9.5.4-Windows", -"10.0a1", -"10.0a1-MacOS", -"10.0a1-Linux", -"10.0a1-Windows", -"10.0a2", -"10.0a2-MacOS", -"10.0a2-Linux", -"10.0a2-Windows", -"10.0a4", -"10.0a4-MacOS", -"10.0a4-Linux", -"10.0a4-Windows", "10.0a5", "10.0a5-MacOS", "10.0a5-Linux",

1 0

[tpo/staging] Change tiers order
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 75cd8ebf66d87e44d848a4778e8df0e0441a902b Author: antonela <antonela(a)torproject.org> Date: Mon Aug 31 10:18:16 2020 -0300 Change tiers order --- templates/membership.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/membership.html b/templates/membership.html index 5bf44744..2da30ccc 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -10,12 +10,12 @@ <div class="container"> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/green.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/shallot.png' }}" /> </div> <div class="col-sm-8"> - <a class="h2 col-12 text-primary p-0" href="#green">Green Onion Member</a> - <p class="nick">$10,000 - $49,999 per year</p> - <p>Your organization’s name, linking back to your website, is featured on our Membership Program page.</p> + <a class="h2 col-12 text-primary p-0" href="#shallot">Shallot Onion Member</a> + <p class="nick">≥ $100,000 per year year</p> + <p>Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.</p> </div> </div> <div class="row py-3"> @@ -30,12 +30,12 @@ </div> <div class="row py-3"> <div class="col"> - <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/shallot.png' }}" /> + <img class="img-fluid p-3 align-self-center float-right" width="200px" src="{{ '../../static/images/membership/green.png' }}" /> </div> <div class="col-sm-8"> - <a class="h2 col-12 text-primary p-0" href="#shallot">Shallot Onion Member</a> - <p class="nick">≥ $100,000 per year year</p> - <p>Your organization’s logo, linking back to your website, along with a quote from your organization about your motivation for joining the Membership Program, is featured on our Membership Program page. We will also engage in social media, events, and other promotional mechanisms.</p> + <a class="h2 col-12 text-primary p-0" href="#green">Green Onion Member</a> + <p class="nick">$10,000 - $49,999 per year</p> + <p>Your organization’s name, linking back to your website, is featured on our Membership Program page.</p> </div> </div> </div>

1 0

[tpo/staging] Add Cymru - Vidalia
by hiro＠torproject.org 27 Sep '20

27 Sep '20

commit 031259ddf8daf97558a182ae962a8db9eed909f7 Author: antonela <antonela(a)torproject.org> Date: Mon Aug 31 10:37:19 2020 -0300 Add Cymru - Vidalia --- assets/static/images/membership/logos/Cymru.png | Bin 0 -> 25478 bytes templates/membership.html | 5 +++++ 2 files changed, 5 insertions(+) diff --git a/assets/static/images/membership/logos/Cymru.png b/assets/static/images/membership/logos/Cymru.png new file mode 100644 index 00000000..433f4781 Binary files /dev/null and b/assets/static/images/membership/logos/Cymru.png differ diff --git a/templates/membership.html b/templates/membership.html index 5f879b9f..d468152f 100644 --- a/templates/membership.html +++ b/templates/membership.html @@ -83,6 +83,11 @@ <img class="card-img-top p-5" src="{{ '../../static/images/membership/logos/Avast.png' }}" alt="Avast"> </div> </div> + <div class="col-md-3 col-xl-3 my-2"> + <div class="card border-1 h-100"> + <img class="card-img-top p-3" src="{{ '../../static/images/membership/logos/Cymru.png' }}" alt="Cymru"> + </div> + </div> <div class="col-md-3 col-xl-3 my-2"> <div class="card border-1 h-100"> <img class="card-img-top p-3" src="{{ '../../static/images/membership/logos/MullvadVPN.png' }}" alt="MullvadVPN">

1 0