tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[tpo/staging] Bump to 0.4.2.2-alpha
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 20c5595050bc81c4e4f67893cb3dc505a9217844 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 7 09:14:09 2019 -0400 Bump to 0.4.2.2-alpha --- databags/versions.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/versions.ini b/databags/versions.ini index 86a9f6b..ae243e2 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -12,5 +12,5 @@ version = 9.0a7 version = 0.4.1.6 [tor-alpha] -version = 0.4.2.1-alpha +version = 0.4.2.2-alpha

1 0

[tpo/staging] Delete fvcn.ico
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit e06f2f163cb63f22ddce6d33fd8b32e4794ff3a6 Author: Aadi Bajpai <me(a)aadibajpai.me> Date: Tue Oct 8 22:46:03 2019 +0530 Delete fvcn.ico --- assets/static/images/favicon/fvcn.ico | 1 - 1 file changed, 1 deletion(-) diff --git a/assets/static/images/favicon/fvcn.ico b/assets/static/images/favicon/fvcn.ico deleted file mode 100644 index 4202011..0000000 --- a/assets/static/images/favicon/fvcn.ico +++ /dev/null @@ -1 +0,0 @@ -to be deleted

1 0

[tpo/staging] Add favicon to file
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 1bf167991f17f35ad80fe393362dab9681bd6fa2 Author: Aadi Bajpai <me(a)aadibajpai.me> Date: Tue Oct 8 22:49:08 2019 +0530 Add favicon to file --- templates/meta.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/meta.html b/templates/meta.html index 04b9e93..a301461 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -14,4 +14,8 @@ <link rel="stylesheet" href="{{ '/static/css/digital-climate-strike/main.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet"> + +<link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico"> + +<link rel="icon" type="image/png" href="https://www.torproject.org/static/images/favicon/favicon.png"> <title>{{ _("Tor Project") }} | {% block title %}{{ this.title }}{% endblock %}</title>

1 0

[tpo/staging] Update contact.html
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit dff947a816818c55f9e89c5ed253ecc14ec19f1b Author: Enjeck Cleopatra <32180937+PROTechThor(a)users.noreply.github.com> Date: Thu Oct 10 12:08:56 2019 +0100 Update contact.html --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 016b2a4..669da91 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -77,7 +77,7 @@ </div> <div class="row mt-3 mr-5"> <h4 class="text-primary">{{ _('Report a security issue.') }}</h4> - <p class="text-tpo">{{ _("If you've found a security issue in one of our projects or in our infrastructure, please email tor-security(a)lists.torproject.org. If you found a bug in Tor or Tor Browser, feel free to submit a bug report for our <a href="https://hackerone.com/torproject" target="_blank">{{ _('bug bounty program.') }}</a> If you want to encrypt your mail, you can get the GPG public key for the list by contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-keyservers.net. Here is the fingerprint:") }}</p> + <p class="text-tpo">{{ _("If you've found a security issue in one of our projects or in our infrastructure, please email tor-security(a)lists.torproject.org. If you've found a security bug in Tor or Tor Browser, feel free to submit it for our <a href="https://hackerone.com/torproject" target="_blank">{{ _('bug bounty program.') }}</a> If you want to encrypt your mail, you can get the GPG public key for the list by contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-keyservers.net. Here is the fingerprint:") }}</p> </div> <div class="row mt-3 mr-5"> <p class="nick text-primary">gpg --fingerprint tor-security(a)lists.torproject.org <br />

1 0

[tpo/staging] Fix contact template error
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 0f887f20c943bc3e2b58b8f0123c44e9b02c7e10 Author: gus <gus(a)torproject.org> Date: Thu Oct 10 11:36:27 2019 -0400 Fix contact template error --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 669da91..6883853 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -77,7 +77,7 @@ </div> <div class="row mt-3 mr-5"> <h4 class="text-primary">{{ _('Report a security issue.') }}</h4> - <p class="text-tpo">{{ _("If you've found a security issue in one of our projects or in our infrastructure, please email tor-security(a)lists.torproject.org. If you've found a security bug in Tor or Tor Browser, feel free to submit it for our <a href="https://hackerone.com/torproject" target="_blank">{{ _('bug bounty program.') }}</a> If you want to encrypt your mail, you can get the GPG public key for the list by contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-keyservers.net. Here is the fingerprint:") }}</p> + <p class="text-tpo">{{ _("If you've found a security issue in one of our projects or in our infrastructure, please email tor-security(a)lists.torproject.org. If you've found a security bug in Tor or Tor Browser, feel free to submit it for our") }} <a href="https://hackerone.com/torproject" target="_blank">{{ _('bug bounty program.') }}</a> {{ _("If you want to encrypt your mail, you can get the GPG public key for the list by contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-keyservers.net. Here is the fingerprint:") }}</p> </div> <div class="row mt-3 mr-5"> <p class="nick text-primary">gpg --fingerprint tor-security(a)lists.torproject.org <br />

1 0

[tpo/staging] Minor change
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 6fdd27440fe6c41e6184305d83bee19ca1ed5aab Author: Enjeck Cleopatra <32180937+PROTechThor(a)users.noreply.github.com> Date: Thu Oct 10 10:19:10 2019 +0100 Minor change --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 46792d4..016b2a4 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -77,7 +77,7 @@ </div> <div class="row mt-3 mr-5"> <h4 class="text-primary">{{ _('Report a security issue.') }}</h4> - <p class="text-tpo">{{ _("If you've found a security issue in one of our projects or in our infrastructure, please email tor-security(a)lists.torproject.org. Feel free to submit a bug report for our <a href="https://hackerone.com/torproject" target="_blank">{{ _('bug bounty program.') }}</a> If you want to encrypt your mail, you can get the GPG public key for the list by contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-keyservers.net. Here is the fingerprint:") }}</p> + <p class="text-tpo">{{ _("If you've found a security issue in one of our projects or in our infrastructure, please email tor-security(a)lists.torproject.org. If you found a bug in Tor or Tor Browser, feel free to submit a bug report for our <a href="https://hackerone.com/torproject" target="_blank">{{ _('bug bounty program.') }}</a> If you want to encrypt your mail, you can get the GPG public key for the list by contacting tor-security-sendkey(a)lists.torproject.org or from pool.sks-keyservers.net. Here is the fingerprint:") }}</p> </div> <div class="row mt-3 mr-5"> <p class="nick text-primary">gpg --fingerprint tor-security(a)lists.torproject.org <br />

1 0

[tpo/staging] We are now supporting aarch64 for android
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 753988da6d3badb88e5a598f3bb9d359de8880fe Author: Pili Guerra <mpguerra(a)users.noreply.github.com> Date: Mon Oct 14 13:29:00 2019 +0200 We are now supporting aarch64 for android Add aarch64 to Android apk download list --- templates/download-android.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/download-android.html b/templates/download-android.html index 07a421c..1f8fa2d 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -21,6 +21,8 @@ <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-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-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-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] Merge branch 'PROTechThor-link'
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 581ed20ac416447ad221ed5dd249b37c435f3f01 Merge: 1bf1679 dff947a Author: gus <gus(a)torproject.org> Date: Thu Oct 10 09:15:31 2019 -0400 Merge branch 'PROTechThor-link' templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tpo/staging] Fix frontdesk email address
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit 8caaa36eba9486185748d750e59a0b0412e60bfe Author: gus <gus(a)torproject.org> Date: Thu Oct 10 11:44:16 2019 -0400 Fix frontdesk email address --- templates/contact.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/contact.html b/templates/contact.html index 6883853..038f5b8 100644 --- a/templates/contact.html +++ b/templates/contact.html @@ -98,7 +98,7 @@ <div class="row"> <div class="col-md-8 p-0 pr-5"> <h3 class="text-primary display-5">{{ _('Email us') }}</h3> - <p class="text-tpo">{{ _('For questions and comments about Tor the non-profit organization: trademark questions, affiliation and coordination, contract inquiries, etc, please email frontdesk(a)rt.torproject.org. For donor-related questions, contact giving(a)torproject.org') }}.</p> + <p class="text-tpo">{{ _('For questions and comments about Tor the non-profit organization: trademark questions, affiliation and coordination, contract inquiries, etc, please email frontdesk(a)torproject.org. For donor-related questions, contact giving(a)torproject.org') }}.</p> </div> <div class="d-block d-sm-none container py-3"> <div class="row border-bottom border-light"><p></p></div>

1 0

[tpo/staging] update to last master
by emmapeel＠torproject.org 15 Oct '19

15 Oct '19

commit a7a18c6f5b225c3ae828f844e76850d448fcb363 Merge: 01bc40f 753988d Author: emma peel <emma.peel(a)riseup.net> Date: Tue Oct 15 10:36:41 2019 +0200 update to last master .github/FUNDING.yml | 3 + .htaccess | 7 +- README.md | 63 ++++++++++++++++ assets/javascript | 2 +- assets/scss | 2 +- assets/static/css | 2 +- assets/static/fonts | 2 +- assets/static/images/dcs-logo.png | Bin 0 -> 10135 bytes assets/static/images/favicon/favicon.ico | Bin 0 -> 4286 bytes assets/static/images/favicon/favicon.png | Bin 0 -> 1184 bytes assets/static/images/people/orig/wshackleton.png | Bin 0 -> 239868 bytes assets/static/images/people/wshackleton.png | Bin 0 -> 29922 bytes assets/static/js | 2 +- assets/static/keys/sstevenson.txt | 79 +++++++++++++++++++++ content/about/cy-pres/contents.lr | 4 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/anarcat/contents.lr | 17 +++++ content/about/people/arma/contents.lr | 4 +- content/about/people/ggus/contents.lr | 4 +- content/about/people/igt0/contents.lr | 17 ----- content/about/people/juga/contents.lr | 2 +- content/about/people/meejah/contents.lr | 2 + content/about/people/sajolida/contents.lr | 2 +- content/about/people/schneier-core/contents.lr | 15 ++++ content/about/people/schneier/contents.lr | 13 ++++ content/about/people/sstevenson/contents.lr | 4 ++ content/about/people/wshackleton/contents.lr | 20 ++++++ .../about/reports/2009-data-collection/contents.lr | 2 +- .../about/reports/2010-irs-form-990/contents.lr | 4 +- content/about/reports/2011-form-pc/contents.lr | 2 +- .../reports/2012-financial-statements/contents.lr | 2 +- content/about/reports/2012-form-pc/contents.lr | 2 +- content/about/reports/2013-form-pc/contents.lr | 2 +- .../2016-12-05-tor-project-bylaws/contents.lr | 6 +- .../about/sponsors/DARPA-georgetown/contents.lr | 17 +++++ content/about/sponsors/nsf-georgetown/contents.lr | 7 +- content/about/sponsors/nsf-minnesota/contents.lr | 2 +- content/about/trademark/contents.lr | 21 ++++++ content/about/trademark/trademark-faq/contents.lr | 15 ++++ .../trademark-faq/trademark-faq-1/contents.lr | 13 ++++ .../trademark-faq/trademark-faq-2/contents.lr | 12 ++++ .../trademark-faq/trademark-faq-3/contents.lr | 13 ++++ .../trademark-faq/trademark-faq-4/contents.lr | 16 +++++ .../trademark-faq/trademark-faq-5/contents.lr | 21 ++++++ .../trademark-faq/trademark-faq-6/contents.lr | 10 +++ .../trademark-faq/trademark-faq-7/contents.lr | 13 ++++ content/download/alpha/contents.lr | 2 +- content/download/languages/contents.lr | 2 +- .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ content/press/in-defense-of-anonymity/contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../contents.lr | 19 +++++ .../mozilla-offers-research-grant/contents.lr | 19 +++++ content/press/new-release-tor-browser/contents.lr | 2 +- .../contents.lr | 19 +++++ .../torbrowser/RecommendedTBBVersions/contents.lr | 20 +++--- databags/about+en.ini | 4 ++ databags/menu+bn-BD.ini | 20 +----- databags/menu+de.ini | 20 +----- databags/menu+en.ini | 20 +----- databags/menu+es.ini | 20 +----- databags/menu+fr.ini | 20 +----- databags/menu+id.ini | 20 +----- databags/menu+is.ini | 20 +----- databags/menu+it.ini | 20 +----- databags/menu+ka.ini | 20 +----- databags/menu+ko.ini | 20 +----- databags/menu+pt-BR.ini | 20 +----- databags/menu+ru.ini | 20 +----- databags/menu+tr.ini | 20 +----- databags/menu_footer+ar.ini | 2 +- databags/menu_footer+de.ini | 2 +- databags/menu_footer+en.ini | 16 +---- databags/menu_footer+es.ini | 2 +- databags/menu_footer+fr.ini | 2 +- databags/menu_footer+id.ini | 2 +- databags/menu_footer+is.ini | 2 +- databags/menu_footer+it.ini | 2 +- databags/menu_footer+ka.ini | 2 +- databags/menu_footer+ko.ini | 2 +- databags/menu_footer+pt-BR.ini | 2 +- databags/menu_footer+ru.ini | 2 +- databags/menu_footer+tr.ini | 2 +- databags/menu_footer+zh-CN.ini | 2 +- databags/versions.ini | 16 +++-- lego | 2 +- models/person.ini | 5 ++ models/question.ini | 20 ++++++ models/topic.ini | 23 ++++++ models/trademark.ini | 34 +++++++++ templates/about.html | 9 ++- templates/bottom_banner.html | 1 + templates/contact.html | 13 ++-- templates/download-android.html | 31 ++++---- templates/download-options.html | 37 ++++++++++ templates/hero-download.html | 18 +++-- templates/macros/contact.html | 2 +- templates/macros/downloads.html | 15 ++-- templates/macros/footer.html | 2 +- templates/macros/people.html | 5 +- templates/macros/question.html | 22 ++++++ templates/macros/topic.html | 18 +++++ templates/meta.html | 7 +- templates/question.html | 6 ++ templates/topic.html | 6 ++ templates/trademark.html | 6 ++ 110 files changed, 886 insertions(+), 382 deletions(-) diff --cc templates/download-android.html index c299b45,1f8fa2d..5223003 --- a/templates/download-android.html +++ b/templates/download-android.html @@@ -14,36 -14,25 +14,29 @@@ <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-md-6 col-sm-4 text-center p1"> - <div class="row"> - {% set t = bag('versions', 'torbrowser-alpha') %} - <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" 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-4 my-1" 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> - </div> - </div> - <div class="col-md-3 col-sm-4 text-center p1"> - <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> - </div> + <div class="col-xl-6 mx-auto text-center"> + {% set t = bag('versions', 'torbrowser-stable-android') %} + <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-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-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-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 %} - <div class="col-md-3 col-sm-4 text-center p1"> - <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> -  - </div> - </div> - <div class="row"> - <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a> + <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> +  + </div> </div> </div> - <div class="d-none d-lg-block col-lg-5 col-md-6"> - <img class="img-fluid p-5 m-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> - </div> </div> <div class="row pb-5"> <a class="text-light mx-auto text-center nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you an iOS user? We encourage you to try Onion Browser.') }} </a>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019