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

[tor-browser/tor-browser-60.8.0esr-9.0-1] Bug 1477259 - Use separate version codes for 64-bit builds; r=nalexander
by gk＠torproject.org 30 Jul '19

30 Jul '19

commit c847e888cd2a4fb7cbddfe8fc890fe25a024faf7 Author: Jim Chen <nchen(a)mozilla.com> Date: Thu Aug 30 21:51:18 2018 +0000 Bug 1477259 - Use separate version codes for 64-bit builds; r=nalexander Use the unused 'p' bit in the version code to denote 64-bit builds, so we have different version codes for 64-bit builds on aarch64 and x86-64. Differential Revision: https://phabricator.services.mozilla.com/D4260 --HG-- extra : moz-landing-system : lando --- python/mozbuild/mozbuild/android_version_code.py | 53 ++++++++++++------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/python/mozbuild/mozbuild/android_version_code.py b/python/mozbuild/mozbuild/android_version_code.py index 5e786b2358c0..92392d563c42 100644 --- a/python/mozbuild/mozbuild/android_version_code.py +++ b/python/mozbuild/mozbuild/android_version_code.py @@ -49,26 +49,24 @@ def android_version_code_v1(buildid, cpu_arch=None, min_sdk=0, max_sdk=0): The bits labelled 'x', 'p', and 'g' are feature flags. - The bit labelled 'x' is 1 if the build is for an x86 or ARM64 architecture, - and 0 otherwise, which means the build is for a (32-bit) ARM architecture. + The bit labelled 'x' is 1 if the build is for an x86 or x86-64 architecture, + and 0 otherwise, which means the build is for an ARM or ARM64 architecture. (Fennec no longer supports ARMv6, so ARM is equivalent to ARMv7. ARM64 is also known as AArch64; it is logically ARMv8.) - For the same release, x86 and ARM64 builds have higher version codes and + For the same release, x86 and x86_64 builds have higher version codes and take precedence over ARM builds, so that they are preferred over ARM on devices that have ARM emulation. - The bit labelled 'p' is a placeholder that is always 0 (for now). + The bit labelled 'p' is 1 if the build is for a 64-bit architecture (x86-64 + or ARM64), and 0 otherwise, which means the build is for a 32-bit + architecture (x86 or ARM). 64-bit builds have higher version codes so + they take precedence over 32-bit builds on devices that support 64-bit. - Firefox no longer supports API 14 or earlier. - - This version code computation allows for a split on API levels that allowed - us to ship builds specifically for Gingerbread (API 9-10); we preserve - that functionality for sanity's sake, and to allow us to reintroduce a - split in the future. - - At present, the bit labelled 'g' is 1 if the build is an ARM build - targeting API 16+, which will always be the case. + The bit labelled 'g' is 1 if the build targets a recent API level, which + is currently always the case, because Firefox no longer ships releases that + are split by API levels. However, we may reintroduce a split in the future, + in which case the release that targets an older API level will We throw an explanatory exception when we are within one calendar year of running out of build events. This gives lots of time to update the version @@ -113,24 +111,27 @@ def android_version_code_v1(buildid, cpu_arch=None, min_sdk=0, max_sdk=0): # for architecture and APK splits. version |= base << 3 - # None is interpreted as arm. - if not cpu_arch or cpu_arch == 'armeabi-v7a': - # 0 is interpreted as SDK 9. - if not min_sdk or min_sdk == 9: - pass - # This used to compare to 11. The 16+ APK directly supersedes 11+, so - # we reuse this check. - elif min_sdk == 16: - version |= 1 << 0 - else: - raise ValueError("Don't know how to compute android:versionCode " - "for CPU arch %s and min SDK %s" % (cpu_arch, min_sdk)) - elif cpu_arch in ['x86', 'arm64-v8a']: + # 'x' bit is 1 for x86/x86-64 architectures (`None` is interpreted as ARM). + if cpu_arch in ['x86', 'x86_64']: version |= 1 << 2 + elif not cpu_arch or cpu_arch in ['armeabi-v7a', 'arm64-v8a']: + pass else: raise ValueError("Don't know how to compute android:versionCode " "for CPU arch %s" % cpu_arch) + # 'p' bit is 1 for 64-bit architectures. + if cpu_arch in ['arm64-v8a', 'x86_64']: + version |= 1 << 1 + elif cpu_arch in ['armeabi-v7a', 'x86']: + pass + else: + raise ValueError("Don't know how to compute android:versionCode " + "for CPU arch %s" % cpu_arch) + + # 'g' bit is currently always 1, but may depend on `min_sdk` in the future. + version |= 1 << 0 + return version def android_version_code(buildid, *args, **kwargs):

1 0

[tpo/master] Fix some typos and styling
by pili＠torproject.org 30 Jul '19

30 Jul '19

commit 3918950d16680bab005c1460d2c0fa893401dc1d Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 14:19:07 2019 +0100 Fix some typos and styling --- content/about/cy-pres/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/cy-pres/contents.lr b/content/about/cy-pres/contents.lr index f3891bb..6bc656f 100644 --- a/content/about/cy-pres/contents.lr +++ b/content/about/cy-pres/contents.lr @@ -30,11 +30,11 @@ Beyond developing technology, the organization helps people retain their privacy The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). -In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundatio's Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation's Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department – Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. #### Contact the Tor Project about a Cy Pres Award -If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. +If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at [sstevenson@torproject.org](mailto:sstevenson@torproject.org). #### Further Reading

1 0

[tpo/master] Add Cy Pres Awards page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 7314a78f97699a14188dbe6a2e52a8423a1e4ec7 Merge: 6fcaafc d5879b5 Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 12:00:50 2019 +0100 Add Cy Pres Awards page content/cy-pres/.gitkeep | 0 content/cy-pres/contents.lr | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+)

1 0

[tpo/master] Add Cy Pres Awards Page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit bd34824c6bbc48871d9dc17d83c74ddfcc0dc21a Author: Pili Guerra <pili(a)torproject.org> Date: Fri Jul 26 13:54:11 2019 +0000 Add Cy Pres Awards Page --- content/cy-pres/contents.lr | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/content/cy-pres/contents.lr b/content/cy-pres/contents.lr new file mode 100644 index 0000000..094c08b --- /dev/null +++ b/content/cy-pres/contents.lr @@ -0,0 +1,43 @@ +section: home +--- +section_id: home +--- +color: dark +--- +_template: jumbotron.html +--- +title: Cy Pres Awards – Consumer Privacy and Privacy Online +--- +html: cy-pres.html +--- +body: + +## Cy Pres Awards – Consumer Privacy and Privacy Online + +_Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. + +### About the Tor Project + +The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: + +- Creating and deploying free and open anonymity and privacy technologies, +- Supporting their unrestricted availability and use, and +- Furthering their scientific and popular understanding. + +The Tor Project and its surrounding community develops and distributes some of the most popular and widely used free, open source privacy technologies: Tor Browser and the Tor network. + +Beyond developing technology, the organization helps people retain their privacy online. The Tor Project has educated thousands of activists, journalists, human rights defenders, librarians, consumers, and average internet users about how to protect and retain their privacy online. + +The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). + +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. + +### Contact the Tor Project about a Cy Pres Award + +If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. + +### Further Reading + +- [The Tor Project in the Media](https://www.torproject.org/press/) +- [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) +- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file

1 0

[tpo/master] Add Cy Pres Awards page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 6fcaafc660c72bec8e134152f6cc21a7dade1139 Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 11:59:39 2019 +0100 Add Cy Pres Awards page --- content/{ => about}/cy-pres/contents.lr | 24 ++++++++++++------------ templates/cy-pres.html | 7 +++++++ 2 files changed, 19 insertions(+), 12 deletions(-) diff --git a/content/cy-pres/contents.lr b/content/about/cy-pres/contents.lr similarity index 70% rename from content/cy-pres/contents.lr rename to content/about/cy-pres/contents.lr index 094c08b..f3891bb 100644 --- a/content/cy-pres/contents.lr +++ b/content/about/cy-pres/contents.lr @@ -1,24 +1,24 @@ -section: home +_template: about.html --- -section_id: home +section: About --- -color: dark +section_id: about --- -_template: jumbotron.html +html: cy-pres.html --- -title: Cy Pres Awards – Consumer Privacy and Privacy Online +color: primary --- -html: cy-pres.html +title: Cy Pres Awards --- body: -## Cy Pres Awards – Consumer Privacy and Privacy Online +### Cy Pres Awards – Consumer Privacy and Privacy Online _Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. -### About the Tor Project +#### About the Tor Project -The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: +The Tor Project is a U.S.-based 501(3) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: - Creating and deploying free and open anonymity and privacy technologies, - Supporting their unrestricted availability and use, and @@ -30,13 +30,13 @@ Beyond developing technology, the organization helps people retain their privacy The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). -In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundatio's Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. -### Contact the Tor Project about a Cy Pres Award +#### Contact the Tor Project about a Cy Pres Award If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. -### Further Reading +#### Further Reading - [The Tor Project in the Media](https://www.torproject.org/press/) - [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) diff --git a/templates/cy-pres.html b/templates/cy-pres.html new file mode 100644 index 0000000..36fa406 --- /dev/null +++ b/templates/cy-pres.html @@ -0,0 +1,7 @@ +<div class="container py-3 mt-5 content"> + <div class="col-sm-9"> + {% block body %} + {{ this.body }} + {% endblock %} + </div> +</div> \ No newline at end of file

1 0

[tpo/master] Add new directory for cy pres award page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 246a1d1d2a166686187fb1b3a6fd01aa7aaf1a08 Author: Pili Guerra <pili(a)torproject.org> Date: Fri Jul 26 13:50:55 2019 +0000 Add new directory for cy pres award page --- content/cy-pres/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/content/cy-pres/.gitkeep b/content/cy-pres/.gitkeep new file mode 100644 index 0000000..e69de29

1 0

[tpo/master] Add Cy Pres Awards Page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit d5879b528b2e27825f0a6972ad40e9d7d2ad4351 Author: Pili Guerra <pili(a)torproject.org> Date: Fri Jul 26 13:54:11 2019 +0000 Add Cy Pres Awards Page --- content/cy-pres/contents.lr | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/content/cy-pres/contents.lr b/content/cy-pres/contents.lr new file mode 100644 index 0000000..094c08b --- /dev/null +++ b/content/cy-pres/contents.lr @@ -0,0 +1,43 @@ +section: home +--- +section_id: home +--- +color: dark +--- +_template: jumbotron.html +--- +title: Cy Pres Awards – Consumer Privacy and Privacy Online +--- +html: cy-pres.html +--- +body: + +## Cy Pres Awards – Consumer Privacy and Privacy Online + +_Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. + +### About the Tor Project + +The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: + +- Creating and deploying free and open anonymity and privacy technologies, +- Supporting their unrestricted availability and use, and +- Furthering their scientific and popular understanding. + +The Tor Project and its surrounding community develops and distributes some of the most popular and widely used free, open source privacy technologies: Tor Browser and the Tor network. + +Beyond developing technology, the organization helps people retain their privacy online. The Tor Project has educated thousands of activists, journalists, human rights defenders, librarians, consumers, and average internet users about how to protect and retain their privacy online. + +The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). + +In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. + +### Contact the Tor Project about a Cy Pres Award + +If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. + +### Further Reading + +- [The Tor Project in the Media](https://www.torproject.org/press/) +- [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) +- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file

1 0

[tpo/master] Delete old cy-pres directory
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 3bc5176d63819726c76a5cbf469992a6435e4fb6 Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 12:10:59 2019 +0100 Delete old cy-pres directory --- content/cy-pres/.gitkeep | 0 content/cy-pres/contents.lr | 43 ------------------------------------------- 2 files changed, 43 deletions(-) diff --git a/content/cy-pres/.gitkeep b/content/cy-pres/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/content/cy-pres/contents.lr b/content/cy-pres/contents.lr deleted file mode 100644 index 094c08b..0000000 --- a/content/cy-pres/contents.lr +++ /dev/null @@ -1,43 +0,0 @@ -section: home ---- -section_id: home ---- -color: dark ---- -_template: jumbotron.html ---- -title: Cy Pres Awards – Consumer Privacy and Privacy Online ---- -html: cy-pres.html ---- -body: - -## Cy Pres Awards – Consumer Privacy and Privacy Online - -_Cy pres_ awards are funds distributed as a part of class action lawsuit settlements in the United States. When the totality of the funds cannot be distributed to class members, they can be distributed to nonprofit, advocacy, and research groups that generally represent the class members. Consumer privacy _cy pres_ awards can help the Tor Project to educate individuals and organizations about how to retain their privacy online, advocate for privacy protections, and build important free, open source technologies that prioritize privacy. - -### About the Tor Project - -The Tor Project is a U.S.\-based 501\(3\) nonprofit founded in 2006 with the mission of advancing human rights and freedoms by: - -- Creating and deploying free and open anonymity and privacy technologies, -- Supporting their unrestricted availability and use, and -- Furthering their scientific and popular understanding. - -The Tor Project and its surrounding community develops and distributes some of the most popular and widely used free, open source privacy technologies: Tor Browser and the Tor network. - -Beyond developing technology, the organization helps people retain their privacy online. The Tor Project has educated thousands of activists, journalists, human rights defenders, librarians, consumers, and average internet users about how to protect and retain their privacy online. - -The Tor Project is recognized as a leading expert on privacy online, and is [often turned to by the media for information about how individuals and consumers can protect their privacy](https://www.torproject.org/press/). - -In the past, the Tor Project has been the recipient of consumer privacy _cy pres_ awards through the Rose Foundation\'s Consumer Privacy grants. The organization has more than a decade of experience successfully delivering on projects with funders and partners as varied as the U.S. State Department -- Bureau of Democracy, Human Rights, and Labor; National Science Foundation; Defense Advanced Research Projects Agency (DARPA); and the Media Democracy Fund. - -### Contact the Tor Project about a Cy Pres Award - -If you would like to speak to somebody at the Tor Project about whether or not the organization might be appropriate for a _cy pres_ award, please contact Sarah Stevenson, Fundraising Director, at sstevenson(a)torproject.org. - -### Further Reading - -- [The Tor Project in the Media](https://www.torproject.org/press/) -- [The Tor Project Financial Reports](https://www.torproject.org/about/reports/) -- [The Tor Project Board Members and Staff](https://www.torproject.org/about/people/) \ No newline at end of file

1 0

[tpo/master] Merge branch 'master' of https://git.torproject.org/project/web/tpo
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit bcd7da91c73e55d11656320203353a1054aef180 Merge: 3bc5176 b0e53cc Author: Pili Guerra <pili(a)piliguerra.com> Date: Tue Jul 30 12:11:31 2019 +0100 Merge branch 'master' of https://git.torproject.org/project/web/tpo content/about/people/acat/contents.lr | 2 +- content/about/people/agrabeli/contents.lr | 2 +- content/about/people/ahf/contents.lr | 2 +- content/about/people/alsmith/contents.lr | 2 +- content/about/people/antonela/contents.lr | 2 +- content/about/people/atagar/contents.lr | 2 +- content/about/people/bdavila/contents.lr | 2 +- content/about/people/catalyst/contents.lr | 2 +- content/about/people/cindy-core/contents.lr | 2 +- content/about/people/cohosh/contents.lr | 2 +- content/about/people/emmapeel/contents.lr | 2 +- content/about/people/flexlibris/contents.lr | 2 +- content/about/people/gaba/contents.lr | 2 +- content/about/people/iangoldberg/contents.lr | 2 +- content/about/people/intrigeri/contents.lr | 2 +- content/about/people/irl/contents.lr | 2 +- content/about/people/karsten/contents.lr | 2 +- content/about/people/kat/contents.lr | 2 +- content/about/people/kushal/contents.lr | 2 +- content/about/people/ln5/contents.lr | 2 +- content/about/people/mcs/contents.lr | 2 +- content/about/people/nickm/contents.lr | 2 +- content/about/people/pili/contents.lr | 2 +- content/about/people/pospeselr/contents.lr | 2 +- content/about/people/sisbell/contents.lr | 2 +- content/about/people/sjmurdoch/contents.lr | 2 +- content/about/people/ssteele-core/contents.lr | 2 +- content/about/people/sstevenson/contents.lr | 2 +- content/about/people/stephw/contents.lr | 2 +- content/about/people/teor/contents.lr | 2 +- content/about/people/tjr/contents.lr | 2 +- content/about/people/wayward/contents.lr | 2 +- content/about/people/wseltzer/contents.lr | 2 +- templates/macros/people.html | 2 +- 34 files changed, 34 insertions(+), 34 deletions(-)

1 0

[tpo/master] Add cy-pres page
by hiro＠torproject.org 30 Jul '19

30 Jul '19

commit 76501750c65b1598453a45b92fc6535c2f2b722e Author: hiro <hiro(a)torproject.org> Date: Tue Jul 30 13:58:03 2019 +0200 Add cy-pres page --- templates/about.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/about.html b/templates/about.html index 8a6552c..706617d 100644 --- a/templates/about.html +++ b/templates/about.html @@ -12,6 +12,10 @@ <div class="container py-3 mt-5 preamble"> {{ this.parent.body }} </div> + {% elif this.path == "/about/cy-pres" %} + <div class="container py-3 mt-5 preamble"> + {{ this.parent.body }} + </div> {% elif this.parent.path == "/about/jobs" %} <div class="container py-3 mt-5"> {{ this.summary }}

1 0