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

[tpo/master] Use models for reports
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit f96624e8019a3748fb59382e2c90f2b54c242ebd Author: hiro <hiro(a)torproject.org> Date: Mon Jan 21 17:37:35 2019 +0100 Use models for reports --- .../certificate-legal-existence/contents.lr | 9 ++++ content/about/reports/fiscal-year-2017/contents.lr | 11 ++++ models/report.ini | 32 +++++++++++ models/reports.ini | 28 ++++++++++ templates/macros/reports.html | 16 ++++++ templates/reports.html | 63 ++++------------------ 6 files changed, 106 insertions(+), 53 deletions(-) diff --git a/content/about/reports/certificate-legal-existence/contents.lr b/content/about/reports/certificate-legal-existence/contents.lr new file mode 100644 index 0000000..ea4ed8a --- /dev/null +++ b/content/about/reports/certificate-legal-existence/contents.lr @@ -0,0 +1,9 @@ +_model: report +--- +type: document +--- +title: Tor Certificate of Legal Existence +--- +description: Certificate of Legal Existence for Tor Project, Inc. +--- +link: https://gitweb.torproject.org/company/policies.git/plain/corpdocs/Tor-Certi… diff --git a/content/about/reports/fiscal-year-2017/contents.lr b/content/about/reports/fiscal-year-2017/contents.lr new file mode 100644 index 0000000..2dfa9db --- /dev/null +++ b/content/about/reports/fiscal-year-2017/contents.lr @@ -0,0 +1,11 @@ +_model: report +--- +type: report +--- +date: 2017 +--- +tag: Fiscal Year 2017 +--- +title: 2017 IRS Form 990 +--- +link: https://www.torproject.org/about/findoc/2017-TorProject-Form990.pdf diff --git a/models/report.ini b/models/report.ini new file mode 100644 index 0000000..d629831 --- /dev/null +++ b/models/report.ini @@ -0,0 +1,32 @@ +[model] +name = Report +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.description] +label = Description +type = string + +[fields.type] +label = Type +type = string + +[fields.tag] +label = Tag +type = string + +[fields.link] +label = Link +type = string + +[fields.date] +label = date +type = string + +[fields.file] +label = File +type = string diff --git a/models/reports.ini b/models/reports.ini new file mode 100644 index 0000000..eba6b0b --- /dev/null +++ b/models/reports.ini @@ -0,0 +1,28 @@ +[model] +name = Reports +label = {{ this.title }} +hidden = yes + +[fields.title] +label = Title +type = string + +[fields.section] +label = Section +type = string + +[fields.body] +label = Body +type = markdown + +[fields.color] +label = Color +type = string + +[fields.html] +label = Html +type = string + +[children] +model = report +order_by = name diff --git a/templates/macros/reports.html b/templates/macros/reports.html new file mode 100644 index 0000000..1b399a9 --- /dev/null +++ b/templates/macros/reports.html @@ -0,0 +1,16 @@ +{% macro render_document(item, alternative) %} +<tr> + <td>{{ item.title }}</td> + <td>{{ item.description }}</td> + <td><a href="{{ item.link }}">View PDF</a></td> +</tr> +{% endmacro %} + +{% macro render_report(item, alternative) %} +<tr> + <th scope="row">{{ item.date }}</th> + <td><span class="badge-pill badge-success">{{ item.tag }}</span></td> + <td>{{ item.title }}</td> + <td><a href="{{ item.link }}">View PDF</a></td> +</tr> +{% endmacro %} diff --git a/templates/reports.html b/templates/reports.html index 9270d49..80cef40 100644 --- a/templates/reports.html +++ b/templates/reports.html @@ -4,41 +4,11 @@ <div class="container py-3"> <table class="table"> <tbody> - <tr> - <td>Tor Certificate of Legal Existence</td> - <td>Certificate of Legal Existence for Tor Project, Inc.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Tor Articles of Organization</td> - <td>Articles of Organization for Tor Project, Inc.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Tor Articles of Organization as filed</td> - <td>Articles of Organization as they were filed by the Commonwealth of Massachusetts, including continuation pages.</td> - <td>View PDF</td> - </tr> - <tr> - <td>Tor Conflict of Interest Policy</td> - <td>Policy protecting the organization's interest from officers and directors entering arrangements that might benefit their private interests.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Tor Conflict of Interest Policy</td> - <td>Policy protecting the organization's interest from officers and directors entering arrangements that might benefit their private interests.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Form 1023, Exhibit A.</td> - <td>Form 1023, Exhibit A.</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <td>Doc Name</td> - <td>Description.</td> - <td><a href="">View PDF</a></td> - </tr> + {% from "macros/reports.html" import render_document %} + {% set items = this.children %} + {% for item in items.filter(F.type == "document") %} + {{ render_document(item, this.alt) }} + {% endfor %} </tbody> </table> </div> @@ -56,24 +26,11 @@ </tr> </thead> <tbody> - <tr> - <th scope="row">2015</th> - <td><span class="badge-pill badge-primary">IRS 990</span></td> - <td>IRS Form 990</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <th scope="row">2015</th> - <td><span class="badge-pill badge-success">AUDIT</span></td> - <td>Independent Audit Results</td> - <td><a href="">View PDF</a></td> - </tr> - <tr> - <th scope="row">2015</th> - <td><span class="badge-pill badge-secondary">BOARD MEETING</span></td> - <td>Tor Board Meeting Minutes - June</td> - <td><a href="">View PDF</a></td> - </tr> + {% from "macros/reports.html" import render_report %} + {% set items = this.children %} + {% for item in items.filter(F.type == "report") %} + {{ render_report(item, this.alt) }} + {% endfor %} </tbody> </table> </div>

1 0

[tpo/master] this does not work so well, so disabling
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 0ca325f038814ed4718f61c41cfdaf48a8b19e65 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 12:47:34 2019 +0100 this does not work so well, so disabling --- configs/i18n.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index bc54fbb..d65d25e 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en translations = es,fr i18npath = i18n -translate_paragraphwise = True +translate_paragraphwise = False url_prefix = https://torproject.org/

1 0

[tpo/master] this gives a practical link to translators when searching for the string
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 0bc712ea5e48495f74ff2a23121f912cfed9304e Author: emma peel <emma.peel(a)riseup.net> Date: Thu Jan 10 13:52:20 2019 +0100 this gives a practical link to translators when searching for the string --- configs/i18n.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/i18n.ini b/configs/i18n.ini index 2fec8b5..bc54fbb 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -2,3 +2,4 @@ content = en translations = es,fr i18npath = i18n translate_paragraphwise = True +url_prefix = https://torproject.org/

1 0

[tpo/master] empty body generates .pot error
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 6e361c1e03699ccb67097e7284429b6f5e695053 Author: emma peel <emma.peel(a)riseup.net> Date: Tue Jan 15 07:14:14 2019 +0100 empty body generates .pot error --- content/download/contents.lr | 1 + 1 file changed, 1 insertion(+) diff --git a/content/download/contents.lr b/content/download/contents.lr index ed2a069..d2963fd 100644 --- a/content/download/contents.lr +++ b/content/download/contents.lr @@ -9,3 +9,4 @@ color: dark title: download --- body: +Download Tor Browser

1 0

[tpo/master] make fields translatable
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 93d402e1d1df1845f90844fc59a5b8b331c5f7e5 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Jan 11 15:00:13 2019 +0100 make fields translatable --- models/page.ini | 3 +++ models/people.ini | 3 +++ models/person.ini | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/models/page.ini b/models/page.ini index f913c43..ab36981 100644 --- a/models/page.ini +++ b/models/page.ini @@ -5,14 +5,17 @@ label = {{ this.title }} [fields.title] label = Title type = string +translate = True [fields.section] label = Section type = string +translate = True [fields.body] label = Body type = markdown +translate = True [fields.color] label = Color diff --git a/models/people.ini b/models/people.ini index d7f8a86..2f860be 100644 --- a/models/people.ini +++ b/models/people.ini @@ -6,14 +6,17 @@ hidden = yes [fields.title] label = Title type = string +translate = True [fields.section] label = Section type = string +translate = True [fields.body] label = Body type = markdown +translate = True [fields.color] label = Color diff --git a/models/person.ini b/models/person.ini index 39b6fca..462333a 100644 --- a/models/person.ini +++ b/models/person.ini @@ -15,10 +15,12 @@ addon_label = @ [fields.title] label = Title type = string +translate = True [fields.role] label = Role type = string +translate = True [fields.name] label = Name @@ -27,6 +29,7 @@ type = string [fields.description] label = Description type = markdown +translate = True [fields.image] label = Image @@ -35,3 +38,4 @@ type = string [fields.pronoun] label = Pronoun type = string +translate = True

1 0

[tpo/master] Merge remote-tracking branch 'origin/staging' into staging
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit ec7b83c8f0f726111d8875595c8e4f2c77cccecc Merge: 93d402e 70a1687 Author: emma peel <emma.peel(a)riseup.net> Date: Fri Jan 11 15:01:47 2019 +0100 Merge remote-tracking branch 'origin/staging' into staging content/about/contents+en.lr | 13 - content/about/contents+es.lr | 13 - content/about/contents+fr.lr | 13 - content/about/history/contents+en.lr | 31 - content/about/history/contents+es.lr | 31 - content/about/history/contents+fr.lr | 31 - content/about/jobs/contents+en.lr | 13 - content/about/jobs/contents+es.lr | 13 - content/about/jobs/contents+fr.lr | 13 - content/about/people/contents+en.lr | 15 - content/about/people/contents+es.lr | 15 - content/about/people/contents+fr.lr | 15 - content/about/reports/contents+en.lr | 13 - content/about/reports/contents+es.lr | 13 - content/about/reports/contents+fr.lr | 13 - content/about/sponsors/contents+en.lr | 13 - content/about/sponsors/contents+es.lr | 13 - content/about/sponsors/contents+fr.lr | 13 - content/contact/contents+en.lr | 15 - content/contact/contents+es.lr | 15 - content/contact/contents+fr.lr | 15 - content/contents+en.lr | 16 - content/contents+es.lr | 16 - content/contents+fr.lr | 16 - content/download/contents+en.lr | 11 - content/download/contents+es.lr | 11 - content/download/contents+fr.lr | 11 - content/press/contents+en.lr | 13 - content/press/contents+es.lr | 13 - content/press/contents+fr.lr | 13 - i18n/contents+en.po | 79 -- i18n/contents+es.po | 1895 --------------------------------- i18n/contents+fr.po | 426 -------- 33 files changed, 2859 deletions(-)

1 0

[tpo/master] better strings to translate
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 27793e087719ba4a40b46af7f5995fe10036167c Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 16:06:27 2019 +0100 better strings to translate --- content/about/history/contents.lr | 25 +++++++++++++++++-------- content/about/people/agrabeli/contents.lr | 3 +-- content/about/people/biella/contents.lr | 13 ++++--------- content/about/people/catalyst/contents.lr | 4 ++-- content/about/people/cindy/contents.lr | 13 +++---------- content/about/people/ewyatt/contents.lr | 3 +-- content/about/people/flexlibris/contents.lr | 5 ++--- content/about/people/gunner/contents.lr | 5 ++--- content/about/people/julius/contents.lr | 13 +++++-------- content/about/people/megan/contents.lr | 15 ++++----------- content/about/people/phoul/contents.lr | 4 ++-- content/about/people/phw/contents.lr | 5 +---- content/about/people/ramy/contents.lr | 24 +++++++----------------- content/about/people/redshiftzero/contents.lr | 3 +-- 14 files changed, 52 insertions(+), 83 deletions(-) diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index 147dbb2..ee2aa85 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -10,22 +10,31 @@ title: History --- body: -In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1994, the Navy Research Lab (NRL), funded by the office of Naval Research (ONR) started researching a way to communicate privately and securely online. They created the first research design and prototype of onion routing. +In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1994, the Navy Research Lab (NRL), funded by the office of Naval Research (ONR) started researching a way to communicate privately and securely online. +They created the first research design and prototype of onion routing. -The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. This is still a simple explanation for how Tor works today. +The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. +This is still a simple explanation for how Tor works today. -In 2001, Roger Dingledine, then a student at MIT, adapted code from an undergraduate Cambridge student’s thesis and began referring to the project as Tor, which stood for The Onion Router. Nick Mathewson, also a student at MIT, became involved in Tor’s development around this time, too. +In 2001, Roger Dingledine, then a student at MIT, adapted code from an undergraduate Cambridge student’s thesis and began referring to the project as Tor, which stood for The Onion Router. +Nick Mathewson, also a student at MIT, became involved in Tor’s development around this time, too. -In October 2003, Tor network was deployed, and Tor code was released under a free and open MIT license. In order for Tor to work optimally, everyone involved realized that not only does the Tor network need to be decentralized, it should also be maintained by a transparently operating entity with clear separation from its then stakeholders, and it needed to be free and open licensed. By the end of 2003, the network has about a dozen volunteer nodes, mostly in the US, plus one in Germany. +In October 2003, Tor network was deployed, and Tor code was released under a free and open MIT license. +In order for Tor to work optimally, everyone involved realized that not only does the Tor network need to be decentralized, it should also be maintained by a transparently operating entity with clear separation from its then stakeholders, and it needed to be free and open licensed. +By the end of 2003, the network has about a dozen volunteer nodes, mostly in the US, plus one in Germany. -Recognizing the benefit of Tor to digital rights, EFF became a fiscal sponsor of Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor’s development. +Recognizing the benefit of Tor to digital rights, EFF became a fiscal sponsor of Tor in 2004. +In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor’s development. In 2007, the organization began developing bridges to the Tor network to address censorship, such as the need to get around government firewalls, in order for its users to access the open web. Tor began gaining popularity among activists and tech-savvy users interested in privacy, but it was still difficult for less-technically savvy people to use, so in 2009-2010, development of tools beyond just the Tor proxy began, including Tor Browser. -The need for tools safeguarding against mass surveillance became a mainstream concern thanks to the Snowden revelations in 2013. Not only was Tor instrumental to Snowden’s whistleblowing, but content of the leaks also upheld assurances that Tor could not be cracked. +The need for tools safeguarding against mass surveillance became a mainstream concern thanks to the Snowden revelations in 2013. +Not only was Tor instrumental to Snowden’s whistleblowing, but content of the leaks also upheld assurances that Tor could not be cracked. -People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. We fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. +People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. +We fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. -Now the network has thousands of relays and millions of users worldwide. The diversity of Tor users keeps it safe. +Now the network has thousands of relays and millions of users worldwide. +The diversity of Tor users keeps it safe. diff --git a/content/about/people/agrabeli/contents.lr b/content/about/people/agrabeli/contents.lr index c8cb762..5a79008 100644 --- a/content/about/people/agrabeli/contents.lr +++ b/content/about/people/agrabeli/contents.lr @@ -12,5 +12,4 @@ twitter_handle: agrabeli_ --- description: -Maria manages OONI's Partnership Program and writes research reports on internet -censorship around the world. +Maria manages OONI's Partnership Program and writes research reports on internet censorship around the world. diff --git a/content/about/people/biella/contents.lr b/content/about/people/biella/contents.lr index b74b1f0..873eabe 100644 --- a/content/about/people/biella/contents.lr +++ b/content/about/people/biella/contents.lr @@ -12,12 +12,7 @@ nickname: biella --- description: -Gabriella holds the Wolfe Chair in Scientific and Technological Literacy at -McGill University. Trained as an anthropologist, her scholarship explores the -intersection of the cultures of hacking and politics. She has authored two books, -Coding Freedom: The Ethics and Aesthetics of Hacking (Princeton University Press, -2012) and Hacker, Hoaxer, Whistleblower, Spy: The Many Faces of Anonymous (Verso, -2014), which was named to Kirkus Reviews’ Best Books of 2014 and was awarded the -Diana Forsythe Prize by the American Anthropological Association. She has -written for popular media outlets, including the New York Times, Slate, Wired, -MIT Technology Review, Huffington Post, and the Atlantic. +Gabriella holds the Wolfe Chair in Scientific and Technological Literacy at McGill University. +Trained as an anthropologist, her scholarship explores the intersection of the cultures of hacking and politics. +She has authored two books, Coding Freedom: The Ethics and Aesthetics of Hacking (Princeton University Press, 2012) and Hacker, Hoaxer, Whistleblower, Spy: The Many Faces of Anonymous (Verso, 2014), which was named to Kirkus Reviews’ Best Books of 2014 and was awarded the Diana Forsythe Prize by the American Anthropological Association. +She has written for popular media outlets, including the New York Times, Slate, Wired, MIT Technology Review, Huffington Post, and the Atlantic. diff --git a/content/about/people/catalyst/contents.lr b/content/about/people/catalyst/contents.lr index f8b6f1e..fca5a79 100644 --- a/content/about/people/catalyst/contents.lr +++ b/content/about/people/catalyst/contents.lr @@ -12,5 +12,5 @@ pronoun: they --- description: -Software archaeologist and keeper of C language arcana. Works with applied -cryptography, protocol design, software security, and technical debt restructuring. +Software archaeologist and keeper of C language arcana. +Works with applied cryptography, protocol design, software security, and technical debt restructuring. diff --git a/content/about/people/cindy/contents.lr b/content/about/people/cindy/contents.lr index afb9066..8e77966 100644 --- a/content/about/people/cindy/contents.lr +++ b/content/about/people/cindy/contents.lr @@ -11,13 +11,6 @@ nickname: cindy description: Cindy is the Executive Director of the Electronic Frontier Foundation (EFF). -From 2000 to 2015 she served as EFF’s Legal Director as well as its General -Counsel. Cindy first became involved with EFF in 1993, when EFF asked her to -serve as the outside lead attorney in Bernstein v. Dept. of Justice, the -successful First Amendment challenge to the U.S. export restrictions on -cryptography. Ms. Cohn works to ensure that people around the world have the -right to access information and communicate privately and anonymously, including -mounting lawsuits against NSA spying, providing legal counsel to computer -programmers building and developing privacy and anonymity tools, and helping to -develop the Necessary and Proportionate Principles applying international human -rights standards to digital communications surveillance. +From 2000 to 2015 she served as EFF’s Legal Director as well as its General Counsel. +Cindy first became involved with EFF in 1993, when EFF asked her to serve as the outside lead attorney in Bernstein v. Dept. of Justice, the successful First Amendment challenge to the U.S. export restrictions on cryptography. +Ms. Cohn works to ensure that people around the world have the right to access information and communicate privately and anonymously, including mounting lawsuits against NSA spying, providing legal counsel to computer programmers building and developing privacy and anonymity tools, and helping to develop the Necessary and Proportionate Principles applying international human rights standards to digital communications surveillance. diff --git a/content/about/people/ewyatt/contents.lr b/content/about/people/ewyatt/contents.lr index ad1b902..6286a20 100644 --- a/content/about/people/ewyatt/contents.lr +++ b/content/about/people/ewyatt/contents.lr @@ -8,5 +8,4 @@ nickname: ewyatt --- description: -Non-technical switchboard for people-related things: recruiting, onboarding, -benefits, contracts, TPI policy questions, and baked goods. +Non-technical switchboard for people-related things: recruiting, onboarding, benefits, contracts, TPI policy questions, and baked goods. diff --git a/content/about/people/flexlibris/contents.lr b/content/about/people/flexlibris/contents.lr index 3e738ae..d8624a9 100644 --- a/content/about/people/flexlibris/contents.lr +++ b/content/about/people/flexlibris/contents.lr @@ -12,6 +12,5 @@ nickname: flexlibris --- description: -Leads the [Community Team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam) -and [Library Freedom Project](https://libraryfreedomproject.org/). Works on -support, outreach, and training. +Leads the [Community Team](https://trac.torproject.org/projects/tor/wiki/org/teams/CommunityTeam) and [Library Freedom Project](https://libraryfreedomproject.org/). +Works on support, outreach, and training. diff --git a/content/about/people/gunner/contents.lr b/content/about/people/gunner/contents.lr index 373b1dc..05d09b9 100644 --- a/content/about/people/gunner/contents.lr +++ b/content/about/people/gunner/contents.lr @@ -10,6 +10,5 @@ nickname: gunner --- description: -Executive Director of [Aspiration](https://aspirationtech.org/about/people/gunner), -where he works with NGOs, activists, and human rights groups. Meeting facilitator -and member of Tor's Community Council +Executive Director of [Aspiration](https://aspirationtech.org/about/people/gunner), where he works with NGOs, activists, and human rights groups. +Meeting facilitator and member of Tor's Community Council. diff --git a/content/about/people/julius/contents.lr b/content/about/people/julius/contents.lr index dbe58a3..317e0e4 100644 --- a/content/about/people/julius/contents.lr +++ b/content/about/people/julius/contents.lr @@ -4,16 +4,13 @@ role: board --- name: Julius Mittenzwei --- -twitter_handle: ahfaeroey +twitter_handle: mittenzwei --- nickname: julius --- description: -Julius is a lawyer and internet activist with 19 years of leadership experience -as an Executive Director and entrepreneur in the publishing industry. He is a -longtime Tor advocate with a background in the Free Software movement and member -of the Chaos Computer Club (CCC), one of the oldest hacker collectives in the -world. Along with CCC, he has been running Tor nodes since 2005. As a lawyer, -he has represented several Tor exit node operators accused of abuse. He holds a -PhD in Copyright Law from LMU Munich. +Julius is a lawyer and internet activist with 19 years of leadership experience as an Executive Director and entrepreneur in the publishing industry. He is a longtime Tor advocate with a background in the Free Software movement and member of the Chaos Computer Club (CCC), one of the oldest hacker collectives in the world. +Along with CCC, he has been running Tor nodes since 2005. +As a lawyer, he has represented several Tor exit node operators accused of abuse. +He holds a PhD in Copyright Law from LMU Munich. diff --git a/content/about/people/megan/contents.lr b/content/about/people/megan/contents.lr index 286e92f..a9a5b0a 100644 --- a/content/about/people/megan/contents.lr +++ b/content/about/people/megan/contents.lr @@ -10,14 +10,7 @@ nickname: megan --- description: -Megan is Executive Director of the Human Rights Data Analysis Group, where she -designs strategies and methods for statistical analysis of human rights data for -projects in places like Guatemala, Colombia, and Syria. She is lead statistician -on a project in Guatemala in which she analyzes documents from the National -Police Archive. She is lead statistician and author on three reports on -documented deaths in Syria, commissioned by the officer of the United Nations -High Commissioner of Human Rights. Megan is on the Technical Advisory Board for -the Office of the Prosecutor at the International Criminal Court, a Research -Fellow at the Carnegie Mellon University Center for Human Rights Science, and -Human Rights Editor for the Statistical Journal of the International Association -for Official Statistics (IAOS). +Megan is Executive Director of the Human Rights Data Analysis Group, where she designs strategies and methods for statistical analysis of human rights data for projects in places like Guatemala, Colombia, and Syria. +She is lead statistician on a project in Guatemala in which she analyzes documents from the National Police Archive. +She is lead statistician and author on three reports on documented deaths in Syria, commissioned by the officer of the United Nations High Commissioner of Human Rights. +Megan is on the Technical Advisory Board for the Office of the Prosecutor at the International Criminal Court, a Research Fellow at the Carnegie Mellon University Center for Human Rights Science, and Human Rights Editor for the Statistical Journal of the International Association for Official Statistics (IAOS). diff --git a/content/about/people/phoul/contents.lr b/content/about/people/phoul/contents.lr index 3ac93d5..daccc98 100644 --- a/content/about/people/phoul/contents.lr +++ b/content/about/people/phoul/contents.lr @@ -10,5 +10,5 @@ twitter_handle: phoul --- description: -Relay advocate, Outreachy mentor, and a member of the community team. He is also -a director of the Canadian Torservers.net partner Coldhak. +Relay advocate, Outreachy mentor, and a member of the community team. +He is also a director of the Canadian Torservers.net partner Coldhak. diff --git a/content/about/people/phw/contents.lr b/content/about/people/phw/contents.lr index bf38318..288887e 100644 --- a/content/about/people/phw/contents.lr +++ b/content/about/people/phw/contents.lr @@ -10,7 +10,4 @@ twitter: __phw --- description: -Maintains [exitmap](https://gitweb.torproject.org/user/phw/exitmap.git/) and -[sybilhunter](https://gitweb.torproject.org/user/phw/sybilhunter.git/), works on -[bad relay detection](https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRe…, -and does [security and privacy research](https://nymity.ch/papers.html). +Maintains [exitmap](https://gitweb.torproject.org/user/phw/exitmap.git/) and [sybilhunter](https://gitweb.torproject.org/user/phw/sybilhunter.git/), works on [bad relay detection](https://trac.torproject.org/projects/tor/wiki/doc/ReportingBadRe…, and does [security and privacy research](https://nymity.ch/papers.html). diff --git a/content/about/people/ramy/contents.lr b/content/about/people/ramy/contents.lr index 6d9a1bf..1713407 100644 --- a/content/about/people/ramy/contents.lr +++ b/content/about/people/ramy/contents.lr @@ -10,20 +10,10 @@ nickname: ramy --- description: -Ramy is a technologist and privacy and security researcher with a passion for -free/open culture. He has provided and developed digital security plans and -strategies for NGOs and members of the media, emergency response in cases of -physical threats, support on publishing sensitive materials, secure systems for -managing sensitive information, and operational plans for human rights emergency -response teams, in Egypt and the MENA region. Most recently, Ramy has been -volunteering with different NGOs and civil liberty groups in Central & South -America, to enhance their privacy and security through means of behavioral change -based on understanding surveillance and threat models in their own contexts and -environments. Among different hats, Ramy is Senior Research Technologist at the -Egyptian Initiative for Personal Rights (EIPR), Research Fellow with Citizen Lab, -and currently a volunteer visitor with Fundación Acceso assisting collectives -and networks in Central America around infosec and activism. He is also an Internet -Freedom Festival Fellow on security and privacy best practices. Ramy has received -multiple international awards for his important work. Most recently, Ramy -received the 2017 Heroes of Human Rights and Communications Surveillance from -Access Now. +Ramy is a technologist and privacy and security researcher with a passion for free/open culture. +He has provided and developed digital security plans and strategies for NGOs and members of the media, emergency response in cases of physical threats, support on publishing sensitive materials, secure systems for managing sensitive information, and operational plans for human rights emergency response teams, in Egypt and the MENA region. +Most recently, Ramy has been volunteering with different NGOs and civil liberty groups in Central & South America, to enhance their privacy and security through means of behavioral change based on understanding surveillance and threat models in their own contexts and environments. +Among different hats, Ramy is Senior Research Technologist at the Egyptian Initiative for Personal Rights (EIPR), Research Fellow with Citizen Lab, and currently a volunteer visitor with Fundación Acceso assisting collectives and networks in Central America around infosec and activism. +He is also an Internet Freedom Festival Fellow on security and privacy best practices. +Ramy has received multiple international awards for his important work. +Most recently, Ramy received the 2017 Heroes of Human Rights and Communications Surveillance from Access Now. diff --git a/content/about/people/redshiftzero/contents.lr b/content/about/people/redshiftzero/contents.lr index 7c9ab62..48a954b 100644 --- a/content/about/people/redshiftzero/contents.lr +++ b/content/about/people/redshiftzero/contents.lr @@ -10,5 +10,4 @@ twitter_handle: redshiftzero --- description: -Lead developer of the [SecureDrop](https://securedrop.org/) whistleblower -platform based at the [Freedom of the Press Foundation](https://freedom.press/). +Lead developer of the [SecureDrop](https://securedrop.org/) whistleblower platform based at the [Freedom of the Press Foundation](https://freedom.press/).

1 0

[tpo/master] better strings to translate
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 7e3d86bb4b11ed21abe521c089b7dabeff18bf36 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 16:21:35 2019 +0100 better strings to translate --- content/about/people/sjmurdoch/contents.lr | 5 ++--- content/about/people/syverson/contents.lr | 4 ++-- content/about/people/teor/contents.lr | 3 +-- content/about/people/tjr/contents.lr | 3 +-- content/about/people/wseltzer/contents.lr | 4 ++-- 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/content/about/people/sjmurdoch/contents.lr b/content/about/people/sjmurdoch/contents.lr index aca1915..90d2a18 100644 --- a/content/about/people/sjmurdoch/contents.lr +++ b/content/about/people/sjmurdoch/contents.lr @@ -12,6 +12,5 @@ twitter_handle: sjmurdoch --- description: -[Principal Research Fellow](https://www.torproject.org/about/corepeople.html.en) -at University College London. He is the original creator of the -[Tor Browser](https://www.torproject.org/about/corepeople.html.en). +[Principal Research Fellow](https://www.torproject.org/about/corepeople.html.en) at University College London. +He is the original creator of the [Tor Browser](https://www.torproject.org/about/corepeople.html.en). diff --git a/content/about/people/syverson/contents.lr b/content/about/people/syverson/contents.lr index 1bc7042..db68c2d 100644 --- a/content/about/people/syverson/contents.lr +++ b/content/about/people/syverson/contents.lr @@ -8,5 +8,5 @@ nickname: syverson --- description: -[NRL](https://www.nrl.navy.mil/) researcher on most things Tor. Inventor of -[onion routing](https://www.onion-router.net/), and one of the three original designers of Tor. +[NRL](https://www.nrl.navy.mil/) researcher on most things Tor. +Inventor of [onion routing](https://www.onion-router.net/), and one of the three original designers of Tor. diff --git a/content/about/people/teor/contents.lr b/content/about/people/teor/contents.lr index d68c9c3..0777da5 100644 --- a/content/about/people/teor/contents.lr +++ b/content/about/people/teor/contents.lr @@ -10,5 +10,4 @@ pronoun: they --- description: -Tor developer and chutney maintainer. Currently working on onion services, -directory documents, and statistics. +Tor developer and chutney maintainer. Currently working on onion services, directory documents, and statistics. diff --git a/content/about/people/tjr/contents.lr b/content/about/people/tjr/contents.lr index 43a69b3..ac22f3b 100644 --- a/content/about/people/tjr/contents.lr +++ b/content/about/people/tjr/contents.lr @@ -12,5 +12,4 @@ twitter_handle: tomrittervg --- description: -Maintains [Consensus Health](https://consensus-health.torproject.org/), -runs one of the bandwidth authorities, and contributes to Tor Browser. +Maintains [Consensus Health](https://consensus-health.torproject.org/), runs one of the bandwidth authorities, and contributes to Tor Browser. diff --git a/content/about/people/wseltzer/contents.lr b/content/about/people/wseltzer/contents.lr index 77af34b..0035b5b 100644 --- a/content/about/people/wseltzer/contents.lr +++ b/content/about/people/wseltzer/contents.lr @@ -10,5 +10,5 @@ pronoun: she --- description: -[Techie lawyer](https://wendy.seltzer.org/) and former Tor board member. She -works on legal and policy support for private and secure communications. +[Techie lawyer](https://wendy.seltzer.org/) and former Tor board member. +She works on legal and policy support for private and secure communications.

1 0

[tpo/master] Modify gitignore
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit 52aa6b3a81dc1ee2641daa32cace9a303c8798a5 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 17 16:00:01 2019 +0100 Modify gitignore --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 2baf5c4..e978b24 100644 --- a/.gitignore +++ b/.gitignore @@ -4,7 +4,8 @@ node_modules .DS_Store public - +*.mo +*.po contents+*.lr *.egg-info

1 0

[tpo/master] better strings to translate
by hiro＠torproject.org 21 Jan '19

21 Jan '19

commit ddee6034eaf26a109bec9679b07a39481bd5714a Author: emma peel <emma.peel(a)riseup.net> Date: Wed Jan 16 16:41:52 2019 +0100 better strings to translate --- content/about/people/meejah/contents.lr | 4 +--- content/about/people/micahflee/contents.lr | 5 +---- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/content/about/people/meejah/contents.lr b/content/about/people/meejah/contents.lr index 2cf5c16..25ed2a2 100644 --- a/content/about/people/meejah/contents.lr +++ b/content/about/people/meejah/contents.lr @@ -10,6 +10,4 @@ twitter: meejah --- description: -[Author](https://meejah.ca/) of [txtorcon](https://github.com/meejah/txtorcon), -[carml](https://github.com/meejah/carml) and other Tor Python tools including -some for bad-relay hunting. +[Author](https://meejah.ca/) of [txtorcon](https://github.com/meejah/txtorcon), [carml](https://github.com/meejah/carml) and other Tor Python tools including some for bad-relay hunting. diff --git a/content/about/people/micahflee/contents.lr b/content/about/people/micahflee/contents.lr index 7a2e128..02dbbd4 100644 --- a/content/about/people/micahflee/contents.lr +++ b/content/about/people/micahflee/contents.lr @@ -10,7 +10,4 @@ twitter: micahflee --- description: -Developer of [OnionShare](https://github.com/micahflee/onionshare) and -[Tor Browser Launcher](https://github.com/micahflee/torbrowser-launcher) journalist -and security engineer at [The Intercept](https://theintercept.com/staff/micah-lee/) -and advocate for [freedom of the press](https://freedom.press/). +Developer of [OnionShare](https://github.com/micahflee/onionshare) and [Tor Browser Launcher](https://github.com/micahflee/torbrowser-launcher) journalist and security engineer at [The Intercept](https://theintercept.com/staff/micah-lee/) and advocate for [freedom of the press](https://freedom.press/).

1 0