tor-commits July 2020

tor-commits@lists.torproject.org

17 participants
2100 discussions

[tpo/staging] Add Steven Engler to People page
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 7e99198dd07a9c912e7448882e47567d807834f7 Author: gus <gus(a)torproject.org> Date: Wed Jun 17 23:34:23 2020 -0400 Add Steven Engler to People page --- content/about/people/sengler/contents.lr | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/content/about/people/sengler/contents.lr b/content/about/people/sengler/contents.lr new file mode 100644 index 00000000..2d7a1986 --- /dev/null +++ b/content/about/people/sengler/contents.lr @@ -0,0 +1,17 @@ +_model: person +--- +_hidden: yes +--- +role:core +--- +name: Steven Engler +--- +pronoun: he +--- +nickname: opara +--- +gpg: https://db.torproject.org/fetchkey.cgi?fingerprint=A5426A7C41FF8BDE7D5A1A9D… +--- +description: + +Developer on the Shadow network simulator project.

1 0

[tpo/staging] privchat - update save the date link
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit cf3194c445aeea64a2f272d9ef3288b73f4e76d6 Author: Antonela <hola(a)antonela.me> Date: Fri Jun 19 13:49:05 2020 -0300 privchat - update save the date link --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index dacb7276..d672ed68 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 #1 - Online Privacy in 2020: Activism & COVID-19') }} - <a class="btn btn-small bg-primary text-light ml-4 mb-3" href=""><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> + <a class="btn btn-small bg-primary text-light ml-4 mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> <div> <p><span class="text-primary nick">June 23th ∙ 1400 EDT ∙ 1800 UTC ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank">@torproject YouTube channel</a></span></p> </div>

1 0

[tpo/staging] remove wrong word
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit c93a266d63b59d48e6d7a6e5864cccf2f7a72508 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jun 22 18:22:17 2020 -0400 remove wrong word --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index 1b5cc1dc..166864ba 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -33,7 +33,7 @@ <p class="font-family-serif"> When the COVID-19 pandemic hit most countries around the world, many governments looked for technology to trace the spread of the virus in order to fight the pandemic. Contact tracing practices and technologies raised many questions about privacy, particularly: is it possible to trace the virus while respecting people's privacy? - Now amidst the uprising in the U.S. against systemic racism, followed by protests all around the world, the central question about contact tracing, privacy, and surveillance becomes critical. Can the technology used for tracking the virus can be used to track protesters? Will it be? + Now amidst the uprising in the U.S. against systemic racism, followed by protests all around the world, the central question about contact tracing, privacy, and surveillance becomes critical. Can the technology used for tracking the virus be used to track protesters? Will it be? For our first ever PrivChat, the Tor Project is bringing you three amazing guests to chat with us about privacy in this context. </p>

1 0

[tpo/staging] privchat - update donate link
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 596b65547aec9f0708fcb092ca20786b063dbbd2 Author: Antonela <hola(a)antonela.me> Date: Tue Jun 23 08:59:03 2020 -0300 privchat - update donate link --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index 166864ba..e705435c 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -106,6 +106,6 @@ <div class="container"> <div class="row bg-secondary p-5 mx-1 my-5"> <h1><i class="fas fa-hand-holding-usd px-5 text-light"></i></h1> - <h3 class="preamble text-light text-center mx-auto">Your donations make this series and our work at Tor possible. <br/> The best way to support our work is to <a class="text-success" href="/donate" target="_blank">become a monthly donor.</a></h3> + <h3 class="preamble text-light text-center mx-auto">Your donations make this series and our work at Tor possible. <br/> The best way to support our work is to <a class="text-success" href="https://donate.torproject.org/monthly-giving" target="_blank">become a monthly donor.</a></h3> </div> </div>

1 0

[tpo/staging] add missing word for grammar's sake
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit ca00cd348f5aff374b017996f62d8bf695fc222e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri Jun 19 18:59:28 2020 -0400 add missing word for grammar's sake --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index c688784d..1b5cc1dc 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -31,7 +31,7 @@ </div> <div> <p class="font-family-serif"> - When COVID-19 pandemic hit most countries around the world, many governments looked for technology to trace the spread of the virus in order to fight the pandemic. Contact tracing practices and technologies raised many questions about privacy, particularly: is it possible to trace the virus while respecting people's privacy? + When the COVID-19 pandemic hit most countries around the world, many governments looked for technology to trace the spread of the virus in order to fight the pandemic. Contact tracing practices and technologies raised many questions about privacy, particularly: is it possible to trace the virus while respecting people's privacy? Now amidst the uprising in the U.S. against systemic racism, followed by protests all around the world, the central question about contact tracing, privacy, and surveillance becomes critical. Can the technology used for tracking the virus can be used to track protesters? Will it be?

1 0

[tpo/staging] privchat - highlight date and time
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit bfb89e02f213d6566a58e00f2c13ae693ed54dbf Author: Antonela <hola(a)antonela.me> Date: Tue Jun 23 13:26:38 2020 -0300 privchat - highlight date and time --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index e705435c..e6c58f00 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -27,7 +27,7 @@ <p class="h2 text-primary" target="_blank">{{ _('Chapter #1 - Online Privacy in 2020: Activism & COVID-19') }} <a class="btn btn-small bg-primary text-light ml-4 mb-3" href="https://www.youtube.com/watch?v=gSyDvG4Z308" target="_blank"><i class="mr-2 pt-1 fas fa-thumbtack-png"></i> {{ _("Save the date") }} </a></p> <div> - <p><span class="text-primary nick">June 23th ∙ 1400 EDT ∙ 1800 UTC ∙ <a href="https://youtu.be/gSyDvG4Z308" title="Tor Project You Tube Channel" target="_blank">@torproject YouTube channel</a></span></p> + <p><span class="text-primary nick"><mark>June 23th ∙ 1400 EDT ∙ 1800 UTC ∙ <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> </div> <div> <p class="font-family-serif">

1 0

[tpo/staging] Add new Tor Browser version 9.5.1
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit c7f6502de1e9b80c4cd9e1e1a89b8b518e94f391 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jul 1 03:26:18 2020 +0000 Add new Tor Browser version 9.5.1 --- 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 70c945b9..0f545ce0 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -9,6 +9,10 @@ body: "9.5-MacOS", "9.5-Linux", "9.5-Windows", +"9.5.1", +"9.5.1-MacOS", +"9.5.1-Linux", +"9.5.1-Windows", "10.0a1", "10.0a1-MacOS", "10.0a1-Linux", diff --git a/databags/versions.ini b/databags/versions.ini index 5d674928..b1aaf537 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -1,5 +1,5 @@ [torbrowser-stable] -version = 9.5 +version = 9.5.1 win32 = 0.4.3.5 [torbrowser-alpha]

1 0

[tpo/staging] Add new Tor Browser version 9.5.2
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 2f4fcc8b495235fadb5ae567e19d5e9d332a16e1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jul 7 15:54:51 2020 +0000 Add new Tor Browser version 9.5.2 --- databags/versions.ini | 3 +++ templates/download-android.html | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 65455ff4..c9dc1d39 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -2,6 +2,9 @@ version = 9.5.1 win32 = 0.4.3.5 +[torbrowser-android-stable] +version = 9.5.2 + [torbrowser-alpha] version = 10.0a2 diff --git a/templates/download-android.html b/templates/download-android.html index d9aeab80..c95bab0b 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -16,7 +16,7 @@ </div> <div class="row my-5"> <div class="col-xl-6 mx-auto"> - {% set t = bag('versions', 'torbrowser-stable') %} + {% set t = bag('versions', 'torbrowser-android-stable') %} <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>

1 0

[tpo/staging] Add new Tor Browser version 10.0a2
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit 6e436207b02059aa0e7341a3df485fad4d0710f7 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Wed Jul 1 03:27:16 2020 +0000 Add new Tor Browser version 10.0a2 --- 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 0f545ce0..d54369c4 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -16,5 +16,9 @@ body: "10.0a1", "10.0a1-MacOS", "10.0a1-Linux", -"10.0a1-Windows" +"10.0a1-Windows", +"10.0a2", +"10.0a2-MacOS", +"10.0a2-Linux", +"10.0a2-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index b1aaf537..65455ff4 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.5.1 win32 = 0.4.3.5 [torbrowser-alpha] -version = 10.0a1 +version = 10.0a2 [tor-stable] version = 0.4.3.5

1 0

[tpo/staging] Update staging
by gus＠torproject.org 20 Jul '20

20 Jul '20

commit dbb16beffeb925ae4de4637f3affaa9d2259fb3c Merge: 4d29cfb2 f4bad6a2 Author: gus <gus(a)torproject.org> Date: Mon Jul 20 13:03:41 2020 -0400 Update staging .htaccess | 4 +- assets/static/images/circle-pattern.png | Bin 556240 -> 106272 bytes assets/static/images/people/ailanthus.png | Bin 40198 -> 0 bytes assets/static/images/people/dennisjackson.png | Bin 0 -> 45557 bytes assets/static/images/people/ggus.png | Bin 0 -> 21509 bytes assets/static/images/people/isabela.png | Bin 46938 -> 834334 bytes assets/static/images/people/jnewsome.png | Bin 0 -> 79184 bytes assets/static/images/people/narrira.png | Bin 0 -> 45902 bytes assets/static/images/privchat/carmela.png | Bin 0 -> 274355 bytes assets/static/images/privchat/dkg.png | Bin 0 -> 230884 bytes assets/static/images/privchat/matt.png | Bin 0 -> 199735 bytes assets/static/images/privchat/pattern.png | Bin 0 -> 325952 bytes assets/static/images/privchat/privchat.png | Bin 0 -> 19090 bytes assets/static/images/privchat/privchat.svg | 11 + assets/static/images/privchat/roger.png | Bin 0 -> 192986 bytes .../sponsors/Georgetown_logotype_S_blueRGB.png | Bin 0 -> 31850 bytes assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes assets/static/images/sponsors/RIPE_NCC_logo.png | Bin 0 -> 49160 bytes assets/static/images/sponsors/gsoc.png | Bin 0 -> 33641 bytes assets/static/images/sponsors/zcash_logo.png | Bin 0 -> 48816 bytes assets/static/images/tb95/onion-auth.png | Bin 0 -> 52389 bytes assets/static/images/tb95/onion-auth2.png | Bin 0 -> 79194 bytes assets/static/images/tb95/onion-auth2(a)2x.png | Bin 0 -> 270354 bytes assets/static/images/tb95/onion-auth(a)2x.png | Bin 0 -> 192867 bytes assets/static/images/tb95/onion-error.png | Bin 0 -> 86735 bytes assets/static/images/tb95/onion-error(a)2x.png | Bin 0 -> 305169 bytes .../images/tb95/onion-location-propublica.png | Bin 0 -> 195783 bytes .../images/tb95/onion-location-propublica2.png | Bin 0 -> 84147 bytes .../images/tb95/onion-location-propublica2(a)2x.png | Bin 0 -> 295176 bytes .../images/tb95/onion-location-propublica(a)2x.png | Bin 0 -> 659848 bytes .../static/images/tb95/onion-location-riseup.png | Bin 0 -> 152691 bytes .../images/tb95/onion-location-riseup(a)2x.png | Bin 0 -> 471532 bytes assets/static/images/tb95/onion-names.png | Bin 0 -> 89241 bytes assets/static/images/tb95/onion-names(a)2x.png | Bin 0 -> 306049 bytes assets/static/images/tb95/onion-url-bar-update.png | Bin 0 -> 39914 bytes .../static/images/tb95/onion-url-bar-update(a)2x.png | Bin 0 -> 108234 bytes assets/static/keys/dawuud.txt | 471 --------------------- assets/static/keys/dennisjackson.txt | 52 +++ assets/static/keys/jnewsome.txt | 52 +++ assets/static/keys/juris.txt | 321 -------------- assets/static/keys/nyinz.txt | 57 --- assets/static/keys/t0mmy.txt | 51 --- .../about/jobs/backend-engineer-ooni/contents.lr | 4 +- content/about/jobs/executive-assistant/contents.lr | 105 +++++ .../jobs/shadow-simulation-developer/contents.lr | 2 +- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ailanthus/contents.lr | 19 - content/about/people/dawuud/contents.lr | 20 - content/about/people/djackson/contents.lr | 21 + content/about/people/geko/contents.lr | 2 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/hellais/contents.lr | 2 +- content/about/people/isra/contents.lr | 15 - content/about/people/jnewsome/contents.lr | 23 + content/about/people/juris/contents.lr | 15 - content/about/people/leif/contents.lr | 13 - content/about/people/meejah/contents.lr | 2 +- content/about/people/narrira/contents.lr | 17 + content/about/people/pepijn/contents.lr | 19 - content/about/people/sengler/contents.lr | 17 + content/about/people/wayward/contents.lr | 19 - .../about/sponsors/DARPA-georgetown/contents.lr | 2 +- content/about/sponsors/DARPA-penn/contents.lr | 6 +- content/about/sponsors/RIPE NCC/.gitkeep | 0 content/about/sponsors/Zcash/contents.lr | 20 + content/about/sponsors/dial/contents.lr | 2 +- content/about/sponsors/google-soc/contents.lr | 14 +- content/about/sponsors/google-sod/contents.lr | 4 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 4 +- content/about/sponsors/mullvad-vpn/contents.lr | 19 + content/about/sponsors/nsf-georgetown/contents.lr | 13 +- content/about/sponsors/otf/contents.lr | 2 +- content/about/sponsors/ripe-ncc/contents.lr | 19 + content/about/trademark/contents.lr | 2 +- .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../contents.lr | 19 + .../interview-with-the-tor-project/contents.lr | 19 + .../contents.lr | 19 + content/privchat/contents.lr | 3 + .../torbrowser/RecommendedTBBVersions/contents.lr | 32 +- content/releases/contents.lr | 11 + content/releases/tor-browser-95/contents.lr | 83 ++++ content/thank-you/contents.lr | 1 - databags/download-alternatives-alpha.ini | 12 + databags/download-alternatives.ini | 12 + databags/platforms.ini | 4 +- databags/versions.ini | 17 +- lego | 2 +- models/person.ini | 4 +- templates/download-android.html | 22 +- templates/download-options.html | 1 + templates/download-tor.html | 4 + templates/download.html | 2 +- templates/footer-min.html | 92 ++++ templates/hero-download.html | 5 +- templates/layout.html | 6 +- templates/macros/downloads.html | 4 + templates/macros/people.html | 4 +- templates/macros/topic.html | 2 +- templates/meta.html | 6 +- templates/navbar-min.html | 30 ++ templates/people.html | 24 +- templates/privchat.html | 111 +++++ templates/release.html | 65 +++ templates/releases.html | 14 + templates/sidenav.html | 5 +- templates/thank-you.html | 18 +- 112 files changed, 1078 insertions(+), 1119 deletions(-) diff --cc templates/download-android.html index 968a5794,c95bab0b..dbc84a6c --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -14,27 -14,20 +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"> - {% 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> + <div class="col-xl-6 mx-auto"> + {% set t = bag('versions', 'torbrowser-android-stable') %} + <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 e142ecb0,eabd2e40..acc7d869 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@@ -50,6 -51,11 +50,7 @@@ <a class="mx-auto text-white py-3 text-center" href="{{ 'tor'|url(alt=this.alt) }}"><u>{{ _('Download Tor Source Code') }}</u></a> </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 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> </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> diff --cc templates/navbar-min.html index f9d2bc77,51e0bc3b..bcda5cc2 --- a/templates/navbar-min.html +++ b/templates/navbar-min.html @@@ -6,14 -6,44 +6,44 @@@ <nav class="navbar no-background navbar-expand-lg navbar-dark bg-primary p-2"> {% else %} <div class="container-fluid bg-dark"> - <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2 d-flex justify-content-between"> + <nav class="navbar no-background navbar-expand-lg navbar-dark bg-dark p-2"> {% endif %} - <div> - <div class="row"> - <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> - <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > - <span class="sr-only">Tor Logo</span> - </a> + <a class="navbar-brand" href="{{ '/'|url(alt=this.alt) }}"> + <img alt="{{ 'The Tor Project' }}" src="{{ '/static/images/tor-logo(a)2x.png'|asseturl }}" > + <span class="sr-only">Tor Logo</span> + </a> + + </div> + {% set link = bag('links', this.alt, 'donate') %} + {% if link %} + <h4 class="pl-2 pr-2 pt-3"><a href="{{ link }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% else %} + <h4 class="pl-2 pr-2 pt-3"><a href="https://www.torproject.org/donate/{{ this.alt }}" title="{{ _("Donate") }}"><span class="badge badge-warning p-2">{{ _("Donate Now") }}</span></a></h4> + {% endif %} + </div> + </div> + {% set alts = bag('alternatives').items() %} + {% if alts|length > 1 %} + <div class="btn-group dropdown float-right"> + {% if not this.color %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% elif this.color == 'primary' %} + <button type="button" class="btn btn-primary bg-primary dropdown-toggle btn-block" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% else %} + <button type="button" class="btn btn-dark bg-dark dropdown-toggle btn-block my-3 my-sm-0" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> + {% endif %} + {{ bag('alternatives', this.alt, 'language') }} + </button> + <div class="dropdown-menu"> + {% for id, item in bag('alternatives').items() %} + {% if this.alt != id %} + <a class="dropdown-item" href="{{ this.path|url(alt=id) }}">{{ item.language }}</a> + {% endif %} + {% endfor %} + </div> + </div> + {% endif %} + </nav> </div>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2020