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

[tpo/develop] Update volunteer and relay guide links to community portal - Fix #70
by gus＠torproject.org 22 May '20

22 May '20

commit 27d985d40b9d06f633d1a8216c98dcf55bf6336b Author: gus <gus(a)torproject.org> Date: Tue Apr 28 23:44:56 2020 -0400 Update volunteer and relay guide links to community portal - Fix #70 --- templates/thank-you.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/thank-you.html b/templates/thank-you.html index 56d08356..0c9f8d3e 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -18,11 +18,11 @@ </div> <div class="col-md-4"> <i class="h3 py-3 fas fa-cube-png"></i> - <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> + <h4><a href="https://community.torproject.org/relay">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> <i class="h3 py-3 fas fa-hands-helping-png"></i> - <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> + <h4><a href="https://community.torproject.org/">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div> </div>

1 0

[tpo/develop] Merge remote-tracking branch 'dip/core-contributors-update'
by gus＠torproject.org 22 May '20

22 May '20

commit 14c28f96689378ffe3bf60e1d88ecec398670751 Merge: 67485645 30e2ae48 Author: gus <gus(a)torproject.org> Date: Fri Apr 10 21:03:54 2020 -0400 Merge remote-tracking branch 'dip/core-contributors-update' assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/keys/dawuud.txt | 471 ----------------------------- assets/static/keys/jnewsome.txt | 52 ++++ assets/static/keys/juris.txt | 321 -------------------- assets/static/keys/nyinz.txt | 57 ---- assets/static/keys/t0mmy.txt | 51 ---- content/about/people/ailanthus/contents.lr | 19 -- content/about/people/dawuud/contents.lr | 20 -- content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 21 ++ content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/narrira/contents.lr | 17 ++ content/about/people/pepijn/contents.lr | 19 -- content/about/people/wayward/contents.lr | 19 -- 20 files changed, 94 insertions(+), 1022 deletions(-)

1 0

[tpo/develop] stable version is now 0.4.3.5
by gus＠torproject.org 22 May '20

22 May '20

commit 07a908fd176a96a0b9be331b5c7219e40eeadff0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 15 08:35:25 2020 -0400 stable version is now 0.4.3.5 --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 83b26300..3f8ca442 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -6,7 +6,7 @@ win32 = 0.4.2.7 version = 9.5a12 [tor-stable] -version = 0.4.2.7 +version = 0.4.3.5 [tor-alpha] version = 0.4.3.4-rc

1 0

[tpo/develop] Make alert banner responsive
by gus＠torproject.org 22 May '20

22 May '20

commit 2e208215a2e4ec35b8331cfb194f1cb41703cdfd Author: gus <gus(a)torproject.org> Date: Fri May 1 15:35:38 2020 -0400 Make alert banner responsive --- templates/thank-you.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/thank-you.html b/templates/thank-you.html index 0c9f8d3e..d602d8ba 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -1,6 +1,6 @@ <div class="container"> <div class="row border-bottom border-light"> - <div class="badge content bg-warning p-3 mb-5 mx-auto text-lowercase"> + <div class="alert content bg-warning p-3 mb-5 mx-auto text-lowercase"> {{ _('We need your help to keep Tor secure and safe for millions across the globe.') }} <a href="/donate">{{ _('Donate Now') }}</a> </div>

1 0

[tpo/develop] Add new Tor Browser version 9.5a12
by gus＠torproject.org 22 May '20

22 May '20

commit b2a643b04e798afd4400d9f55353135df289ef7b Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Thu May 7 16:28:51 2020 +0000 Add new Tor Browser version 9.5a12 --- 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 8e269a4c..a1a54e03 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -36,5 +36,9 @@ body: "9.5a11", "9.5a11-MacOS", "9.5a11-Linux", -"9.5a11-Windows" +"9.5a11-Windows", +"9.5a12", +"9.5a12-MacOS", +"9.5a12-Linux", +"9.5a12-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index ec820b6b..83b26300 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.0.10 win32 = 0.4.2.7 [torbrowser-alpha] -version = 9.5a11 +version = 9.5a12 [tor-stable] version = 0.4.2.7

1 0

[tpo/develop] Add new Tor Browser version 9.0.10
by gus＠torproject.org 22 May '20

22 May '20

commit 892e053601460ce5104d434295b8729b2fa349d3 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue May 5 14:01:47 2020 +0000 Add new Tor Browser version 9.0.10 --- 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 e86ed14e..8e269a4c 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -17,6 +17,10 @@ body: "9.0.9-MacOS", "9.0.9-Linux", "9.0.9-Windows", +"9.0.10", +"9.0.10-MacOS", +"9.0.10-Linux", +"9.0.10-Windows", "9.5a8", "9.5a8-MacOS", "9.5a8-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 89863399..ec820b6b 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.0.9 +version = 9.0.10 win32 = 0.4.2.7 [torbrowser-alpha]

1 0

[tpo/develop] Update lego
by gus＠torproject.org 22 May '20

22 May '20

commit 078c0a1f7f5722f61432c2f3a509fca64a0375f5 Author: hiro <hiro(a)torproject.org> Date: Fri May 15 14:53:27 2020 +0200 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index fb083d69..7f2289bf 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit fb083d69aa0191f891d1e3243db89e474a1c8c0d +Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3

1 0

[tpo/develop] Update develop branch
by gus＠torproject.org 22 May '20

22 May '20

commit befa788cca44301cceed58b19adb4e584e51ddce Merge: bd1fa463 683c6cc5 Author: gus <gus(a)torproject.org> Date: Fri May 22 09:28:24 2020 -0400 Update develop branch lego | 2 +- templates/download-android.html | 7 +++++++ templates/hero-download.html | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --cc templates/download-android.html index d9aeab80,968a5794..7ebb3d8f --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -14,20 -14,27 +14,27 @@@ <div class="row"> <h3 class="mx-auto text-center text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> + </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> - <div class="col-xl-6 mx-auto text-center"> + <div class="col-xl-6 mx-auto"> {% 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') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></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"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">aarch64</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-aarch64-multi.apk.asc"><small>{{ _('Sig') }}</small></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') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></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"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>{{ _('Sig') }}</small></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') }} <small class="badge-pill badge-dark mx-1 nick">x86_64</small></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"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86_64</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86_64-multi.apk.asc"><small>{{ _('Sig') }}</small></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') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></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"><small>sig</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-2 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> + <a class="btn btn-primary btn-sm nick" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('Sig') }}</small></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 %} diff --cc templates/hero-download.html index eabd2e40,4a1c9157..bfc88aa9 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@@ -43,6 -42,6 +43,7 @@@ <a class="btn btn-primary mt-4" href="#android">{{ _('Download for Android') }}</a> </div> </div> ++ </div> </div> <div class="row p-5">

1 0

[tpo/develop] Update link - Can I distribute Tor to Support portal
by gus＠torproject.org 22 May '20

22 May '20

commit bd1fa46383030eea5f3b3b21a4cbc5dd7696af52 Author: gus <gus(a)torproject.org> Date: Mon May 18 23:31:29 2020 -0400 Update link - Can I distribute Tor to Support portal --- content/about/trademark/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/trademark/contents.lr b/content/about/trademark/contents.lr index 1dc524dc..0566a3d5 100644 --- a/content/about/trademark/contents.lr +++ b/content/about/trademark/contents.lr @@ -18,4 +18,4 @@ body: Content on this site is Copyright The Tor Project, Inc.. Reproduction of content is permitted under a [Creative Commons Attribution 3.0 United States License](https://creativecommons.org/licenses/by/3.0/us/). All use under such license must be accompanied by a clear and prominent attribution that identifies The Tor Project, Inc. as the owner and originator of such content. The Tor Project Inc. reserves the right to change licenses and permissions at any time in its sole discretion. -The Tor® software is licensed in various ways. Learn more about the [various licenses](https://2019.www.torproject.org/docs/faq.html.en#DistributingTor). +The Tor® software is licensed in various ways. Learn more about the [various licenses](https://support.torproject.org/about/distribute-tor/).

1 0

[tpo/develop] Fix #74 - title in trademark page is tiny
by gus＠torproject.org 22 May '20

22 May '20

commit 91e87ee2bfabbe700a09a128fb2cd24505b69e37 Author: gus <gus(a)torproject.org> Date: Mon May 18 23:25:51 2020 -0400 Fix #74 - title in trademark page is tiny --- templates/macros/topic.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/macros/topic.html b/templates/macros/topic.html index 0439c829..7d9996d2 100644 --- a/templates/macros/topic.html +++ b/templates/macros/topic.html @@ -8,7 +8,7 @@ </h3> <div id="{{ t.control }}" role="tabpanel" data-parent="#topics" class="anchor-spacer"> <div id="{{ t.control }}Accordion" data-children=".question"> - <h5 class="text-muted mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h5> + <h1 class="mb-3 p-0 {{ bag('alternatives', alternative, 'direction') }}">{{ item.title }}</h1> {% for q in site.query(item.path).include_undiscoverable(true) %} {{ render_question(q, item._id, alternative) }} {% endfor %}

1 0