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

[sbws/master] docs: add logging examples to example configuration
by juga＠torproject.org 09 Jan '19

09 Jan '19

commit 88a0ef0417cf348edb2e95e96794e719b8a946b3 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 8 18:19:09 2018 +0000 docs: add logging examples to example configuration --- docs/source/examples/sbws.example.ini | 25 +++++++++++++++++++++++++ sbws/config.default.ini | 13 ++++++++----- 2 files changed, 33 insertions(+), 5 deletions(-) diff --git a/docs/source/examples/sbws.example.ini b/docs/source/examples/sbws.example.ini index 0130bdb..7155e66 100644 --- a/docs/source/examples/sbws.example.ini +++ b/docs/source/examples/sbws.example.ini @@ -10,3 +10,28 @@ foo = on [destinations.foo] # the domain and path to the 1GB file. url = https://example.com/does/not/exist.bin + + +## The following logging options are set by default. +## There is no need to change them unless other options are prefered. +; [logging] +; # Whether or not to log to a rotating file the directory paths.log_dname +; to_file = no +; # Whether or not to log to stdout +; to_stdout = yes +; # Whether or not to log to syslog +; # NOTE that when sbws is launched by systemd, stdout goes to journal and +; # syslog. +; to_syslog = no + +; # Level to log at. Debug, info, warning, error, critical. +; level = info +; to_file_level = debug +; to_stdout_level = ${level} +; to_syslog_level = ${level} +; # Format string to use when logging +; format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s +; # verbose formatter useful for debugging +; to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s +; to_stdout_format = ${format} +; to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s \ No newline at end of file diff --git a/sbws/config.default.ini b/sbws/config.default.ini index a2a929f..d7c7b79 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -109,14 +109,17 @@ to_file_max_bytes = 10485760 # never rotate the log file. to_file_num_backups = 50 # Level to log at. Debug, info, warning, error, critical. -level = info +# `level` must be set to the lower of all the handler levels. +level = debug to_file_level = debug -to_stdout_level = ${level} -to_syslog_level = ${level} +to_stdout_level = info +to_syslog_level = info # Format string to use when logging -format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s +format = %(module)s[%(process)s]: <%(levelname)s> %(message)s # verbose formatter useful for debugging to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s +# Not adding %(asctime)s to to stdout since it'll go to syslog when using +# systemd, and it'll have already the date. to_stdout_format = ${format} -to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s +to_syslog_format = ${format}

1 0

[sbws/master] docs: add note about syslog when running systemd
by juga＠torproject.org 09 Jan '19

09 Jan '19

commit 0632a25023927bb5711f3554159394f2daebafb2 Author: juga0 <juga(a)riseup.net> Date: Sat Dec 8 18:21:09 2018 +0000 docs: add note about syslog when running systemd Closes bug #28761. Bugfix v0.6.0 --- docs/source/examples/sbws.example.ini | 15 +++++++++------ docs/source/man_sbws.ini.rst | 2 ++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/source/examples/sbws.example.ini b/docs/source/examples/sbws.example.ini index 7155e66..cf6ff79 100644 --- a/docs/source/examples/sbws.example.ini +++ b/docs/source/examples/sbws.example.ini @@ -16,7 +16,7 @@ url = https://example.com/does/not/exist.bin ## There is no need to change them unless other options are prefered. ; [logging] ; # Whether or not to log to a rotating file the directory paths.log_dname -; to_file = no +; to_file = yes ; # Whether or not to log to stdout ; to_stdout = yes ; # Whether or not to log to syslog @@ -25,13 +25,16 @@ url = https://example.com/does/not/exist.bin ; to_syslog = no ; # Level to log at. Debug, info, warning, error, critical. -; level = info +; # `level` must be set to the lower of all the handler levels. +; level = debug ; to_file_level = debug -; to_stdout_level = ${level} -; to_syslog_level = ${level} +; to_stdout_level = info +; to_syslog_level = info ; # Format string to use when logging -; format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s +; format = %(module)s[%(process)s]: <%(levelname)s> %(message)s ; # verbose formatter useful for debugging ; to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s +; # Not adding %(asctime)s to to stdout since it'll go to syslog when using +; # systemd, and it'll have already the date. ; to_stdout_format = ${format} -; to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s \ No newline at end of file +; to_syslog_format = ${format} \ No newline at end of file diff --git a/docs/source/man_sbws.ini.rst b/docs/source/man_sbws.ini.rst index 0ea98b5..4ec7efb 100644 --- a/docs/source/man_sbws.ini.rst +++ b/docs/source/man_sbws.ini.rst @@ -139,6 +139,8 @@ logging Whether or not to log to stdout. (Default: yes) to_syslog = {yes, no} Whether or not to log to syslog. (Default: no) + NOTE that when sbws is launched by systemd, stdout goes to journal and + syslog. to_file_max_bytes = INT If logging to file, how large (in bytes) should the file be allowed to get before rotating to a new one. 10485760 is 10 MiB. If zero or number of

1 0

[sbws/master] Merge branch 'bug28761'
by juga＠torproject.org 09 Jan '19

09 Jan '19

commit c0f76f21553ef0f5734cf5b9885ef8c883cc0eeb Merge: cd61cb3 0632a25 Author: juga0 <juga(a)riseup.net> Date: Wed Jan 9 16:59:01 2019 +0000 Merge branch 'bug28761' docs/source/examples/sbws.example.ini | 28 ++++++++++++++++++++++++++++ docs/source/man_sbws.ini.rst | 2 ++ sbws/config.default.ini | 17 ++++++++++------- 3 files changed, 40 insertions(+), 7 deletions(-) diff --cc sbws/config.default.ini index be8660b,d7c7b79..f666640 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@@ -107,14 -109,17 +109,15 @@@ to_file_max_bytes = 1048576 # never rotate the log file. to_file_num_backups = 50 # Level to log at. Debug, info, warning, error, critical. - level = info - to_file_level = ${level} - to_stdout_level = ${level} - to_syslog_level = ${level} + # `level` must be set to the lower of all the handler levels. + level = debug + to_file_level = debug + to_stdout_level = info + to_syslog_level = info # Format string to use when logging -format = %(module)s[%(process)s]: <%(levelname)s> %(message)s +format = %(asctime)s %(module)s[%(process)s]: <%(levelname)s> %(message)s - to_file_format = ${format} +to_stdout_format = ${format} +to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s # verbose formatter useful for debugging - #format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s + to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s -# Not adding %(asctime)s to to stdout since it'll go to syslog when using -# systemd, and it'll have already the date. -to_stdout_format = ${format} -to_syslog_format = ${format} +

1 0

[sbws/master] config: change default logging levels and formats
by juga＠torproject.org 09 Jan '19

09 Jan '19

commit 8cd30a308bd2ad8481e5cc5b09dc15bd7462f1ff Author: juga0 <juga(a)riseup.net> Date: Sat Dec 8 18:17:00 2018 +0000 config: change default logging levels and formats And document that when sbws is launched by systemd the stdandard output will go to journal and syslog. Set default level to debug when logging to file and a more verbose format. Operators don't usually want to see the debug log in the stdout or syslog, but they can see it in the file. --- sbws/config.default.ini | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/sbws/config.default.ini b/sbws/config.default.ini index 8abee3d..a2a929f 100644 --- a/sbws/config.default.ini +++ b/sbws/config.default.ini @@ -94,10 +94,12 @@ min_relays = 50 [logging] # Whether or not to log to a rotating file the directory paths.log_dname -to_file = no +to_file = yes # Whether or not to log to stdout to_stdout = yes # Whether or not to log to syslog +# NOTE that when sbws is launched by systemd, stdout goes to journal and +# syslog. to_syslog = no # If logging to file, how large (in bytes) should the file be allowed to get # before rotating to a new one. 10485760 is 10 MiB. If zero or number of @@ -108,13 +110,13 @@ to_file_max_bytes = 10485760 to_file_num_backups = 50 # Level to log at. Debug, info, warning, error, critical. level = info -to_file_level = ${level} +to_file_level = debug to_stdout_level = ${level} to_syslog_level = ${level} # Format string to use when logging format = [%(asctime)s] [%(name)s] [%(levelname)s] %(message)s -to_file_format = ${format} +# verbose formatter useful for debugging +to_file_format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s to_stdout_format = ${format} to_syslog_format = %(module)s[%(process)s]: <%(levelname)s> %(message)s -# verbose formatter useful for debugging -#format = %(asctime)s %(levelname)s %(threadName)s %(filename)s:%(lineno)s - %(funcName)s - %(message)s +

1 0

[tpo/staging] Add some people to the people page
by hiro＠torproject.org 09 Jan '19

09 Jan '19

commit 60dcba405a4601e0288e5af4c1a8f362b2f36c0c Author: hiro <hiro(a)torproject.org> Date: Wed Jan 9 17:08:17 2019 +0100 Add some people to the people page --- content/about/contents+es.lr | 3 + content/about/history/contents+es.lr | 15 +++ content/about/jobs/contents+es.lr | 1 + content/about/people/ahf/contents.lr | 15 +++ content/about/people/alsmith/contents.lr | 13 ++ content/about/people/amoghbl1/contents.lr | 13 ++ content/about/people/andreas/contents.lr | 12 ++ content/about/people/antonela/contents.lr | 13 ++ content/about/people/arlolra/contents.lr | 13 ++ content/about/people/arthuredelstein/contents.lr | 11 ++ content/about/people/bdavila/contents.lr | 13 ++ content/about/people/biella/contents.lr | 23 ++++ content/about/people/cindy/contents.lr | 23 ++++ content/about/people/contents+en.lr | 2 + content/about/people/contents+es.lr | 2 + content/about/people/contents+fr.lr | 2 + content/about/people/contents.lr | 2 + content/about/people/flexlibris/contents.lr | 17 +++ content/about/people/gunner/contents.lr | 15 +++ content/about/people/hellais/contents.lr | 15 +++ content/about/people/hiro/contents.lr | 13 ++ content/about/people/julius/contents.lr | 19 +++ content/about/people/matt/contents.lr | 16 +++ content/about/people/megan/contents.lr | 23 ++++ content/about/people/nighat/contents.lr | 22 ++++ content/about/people/ohmygodel/contents.lr | 13 ++ content/about/people/ramy/contents.lr | 29 +++++ i18n/contents+en.po | 4 +- i18n/contents+es.po | 4 +- i18n/contents+fr.po | 4 +- i18n/contents.pot | 4 +- models/people.ini | 28 ++++ models/person.ini | 37 ++++++ templates/macros/people.html | 20 +++ templates/pagenav.html | 2 +- templates/people.html | 157 ++--------------------- templates/person.html | 1 + 37 files changed, 463 insertions(+), 156 deletions(-) diff --git a/content/about/contents+es.lr b/content/about/contents+es.lr index 0d6c58f..de7aa12 100644 --- a/content/about/contents+es.lr +++ b/content/about/contents+es.lr @@ -8,3 +8,6 @@ title: history --- body: +The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “onion routing” began in the mid 1990s. + +Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web. diff --git a/content/about/history/contents+es.lr b/content/about/history/contents+es.lr index b83f99c..147dbb2 100644 --- a/content/about/history/contents+es.lr +++ b/content/about/history/contents+es.lr @@ -14,3 +14,18 @@ In the 1990s, the lack of security on the internet and its ability to be used fo 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 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. + +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. + +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. diff --git a/content/about/jobs/contents+es.lr b/content/about/jobs/contents+es.lr index 47fbc3e..c88a206 100644 --- a/content/about/jobs/contents+es.lr +++ b/content/about/jobs/contents+es.lr @@ -10,3 +10,4 @@ title: Jobs --- body: +We’re always looking for more great people to join our team. Join us in our Seattle office or work remotely from wherever you are in the world. You’ll work with a diverse group of bright and passionate folks committed to fostering internet freedom worldwide. diff --git a/content/about/people/ahf/contents.lr b/content/about/people/ahf/contents.lr new file mode 100644 index 0000000..0021f52 --- /dev/null +++ b/content/about/people/ahf/contents.lr @@ -0,0 +1,15 @@ +_model: person +--- +role: core +--- +name: Alexander Færøy +--- +twitter_handle: ahfaeroey +--- +pronoun: he +--- +nickname: ahf +--- +description: + +Works on core Tor development. diff --git a/content/about/people/alsmith/contents.lr b/content/about/people/alsmith/contents.lr new file mode 100644 index 0000000..f33f8f6 --- /dev/null +++ b/content/about/people/alsmith/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Al Smith +--- +nickname: alsmith +--- +pronoun: they +--- +description: + +Writes grants and fundraising proposals. diff --git a/content/about/people/amoghbl1/contents.lr b/content/about/people/amoghbl1/contents.lr new file mode 100644 index 0000000..9fe968d --- /dev/null +++ b/content/about/people/amoghbl1/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Amogh Pradeep +--- +twitter_handle: amoghbl1 +--- +nickname: amoghbl1 +--- +description: + +[Lead developer](http://amoghbl1.com/) of Orfox and contributor to Orbot diff --git a/content/about/people/andreas/contents.lr b/content/about/people/andreas/contents.lr new file mode 100644 index 0000000..6dd95d4 --- /dev/null +++ b/content/about/people/andreas/contents.lr @@ -0,0 +1,12 @@ +_model: person +--- +role: core +--- +name: Andreas Lehner +--- +nickname: andreas +--- +description: + +Works at the intersection of security, privacy, data integrity and anonymity both +in politics and technology. diff --git a/content/about/people/antonela/contents.lr b/content/about/people/antonela/contents.lr new file mode 100644 index 0000000..04fa071 --- /dev/null +++ b/content/about/people/antonela/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Antonela Debiasi +--- +nickname: antonela +--- +twitter_handle: holantonela +--- +description: + +Designer working with the UX team. Making Tor usable for everyone. diff --git a/content/about/people/arlolra/contents.lr b/content/about/people/arlolra/contents.lr new file mode 100644 index 0000000..01c88f6 --- /dev/null +++ b/content/about/people/arlolra/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Arlo Breault +--- +nickname: arlolra +--- +twitter_handle: arlolra +--- +description: + +Developer for Snowflake, Tor Messenger, and Check. diff --git a/content/about/people/arthuredelstein/contents.lr b/content/about/people/arthuredelstein/contents.lr new file mode 100644 index 0000000..c3b3576 --- /dev/null +++ b/content/about/people/arthuredelstein/contents.lr @@ -0,0 +1,11 @@ +_model: person +--- +role: core +--- +name: Arthur Edelstein +--- +nickname: arthuredelstein +--- +description: + +Works on Tor Browser. diff --git a/content/about/people/bdavila/contents.lr b/content/about/people/bdavila/contents.lr new file mode 100644 index 0000000..c4881fe --- /dev/null +++ b/content/about/people/bdavila/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Bekeela Davila +--- +pronoun: she +--- +nickname: bdavila +--- +description: + +Grants Manager. diff --git a/content/about/people/biella/contents.lr b/content/about/people/biella/contents.lr new file mode 100644 index 0000000..b74b1f0 --- /dev/null +++ b/content/about/people/biella/contents.lr @@ -0,0 +1,23 @@ +_model: person +--- +role: board +--- +name: Gabriella Coleman +--- +title: Board Clerk +--- +twitter_handle: BiellaColeman +--- +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. diff --git a/content/about/people/cindy/contents.lr b/content/about/people/cindy/contents.lr new file mode 100644 index 0000000..afb9066 --- /dev/null +++ b/content/about/people/cindy/contents.lr @@ -0,0 +1,23 @@ +_model: person +--- +role: board +--- +name: Cindy Cohn +--- +title: Board Treasurer +--- +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. diff --git a/content/about/people/contents+en.lr b/content/about/people/contents+en.lr index b7fde02..92e7258 100644 --- a/content/about/people/contents+en.lr +++ b/content/about/people/contents+en.lr @@ -1,3 +1,5 @@ +_model: people +--- _template: about.html --- section: about diff --git a/content/about/people/contents+es.lr b/content/about/people/contents+es.lr index b7fde02..92e7258 100644 --- a/content/about/people/contents+es.lr +++ b/content/about/people/contents+es.lr @@ -1,3 +1,5 @@ +_model: people +--- _template: about.html --- section: about diff --git a/content/about/people/contents+fr.lr b/content/about/people/contents+fr.lr index b7fde02..92e7258 100644 --- a/content/about/people/contents+fr.lr +++ b/content/about/people/contents+fr.lr @@ -1,3 +1,5 @@ +_model: people +--- _template: about.html --- section: about diff --git a/content/about/people/contents.lr b/content/about/people/contents.lr index b7fde02..92e7258 100644 --- a/content/about/people/contents.lr +++ b/content/about/people/contents.lr @@ -1,3 +1,5 @@ +_model: people +--- _template: about.html --- section: about diff --git a/content/about/people/flexlibris/contents.lr b/content/about/people/flexlibris/contents.lr new file mode 100644 index 0000000..3e738ae --- /dev/null +++ b/content/about/people/flexlibris/contents.lr @@ -0,0 +1,17 @@ +_model: person +--- +role: core +--- +name: Alison Macrina +--- +pronoun: she +--- +twitter_handle: flexlibris +--- +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. diff --git a/content/about/people/gunner/contents.lr b/content/about/people/gunner/contents.lr new file mode 100644 index 0000000..373b1dc --- /dev/null +++ b/content/about/people/gunner/contents.lr @@ -0,0 +1,15 @@ +_model: person +--- +role: core +--- +name: Allen Gunn +--- +twitter_handle: allengunn +--- +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 diff --git a/content/about/people/hellais/contents.lr b/content/about/people/hellais/contents.lr new file mode 100644 index 0000000..7d5790c --- /dev/null +++ b/content/about/people/hellais/contents.lr @@ -0,0 +1,15 @@ +_model: person +--- +role: core +--- +name: Arturo Filastò +--- +twitter_handle: hellais +--- +nickname: hellais +--- +description: + +Project leader for [OONI](https://ooni.torproject.org/), has helped with +[tor2web](http://tor2web.org/), wrote Atlas which later became +[Relay Search](https://metrics.torproject.org/rs.html), and helps improve security. diff --git a/content/about/people/hiro/contents.lr b/content/about/people/hiro/contents.lr new file mode 100644 index 0000000..f7df514 --- /dev/null +++ b/content/about/people/hiro/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +name: Silvia Puglisi +--- +twitter_handle: nopressure +--- +nickname: hiro +--- +description: + +Hiro builds and runs Tor Project's web applications and services. diff --git a/content/about/people/julius/contents.lr b/content/about/people/julius/contents.lr new file mode 100644 index 0000000..dbe58a3 --- /dev/null +++ b/content/about/people/julius/contents.lr @@ -0,0 +1,19 @@ +_model: person +--- +role: board +--- +name: Julius Mittenzwei +--- +twitter_handle: ahfaeroey +--- +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. diff --git a/content/about/people/matt/contents.lr b/content/about/people/matt/contents.lr new file mode 100644 index 0000000..955fb2f --- /dev/null +++ b/content/about/people/matt/contents.lr @@ -0,0 +1,16 @@ +_model: person +--- +role: board +--- +name: Matt Blaze +--- +title: Board Chair +--- +nickname: matt +--- +description: + +Matt is a professor in the computer and information science department at the +University of Pennsylvania, where he directs the Distributed Systems Laboratory. +He has been doing research on surveillance technology for over 20 years, as well +as cryptography, secure systems, and public policy. diff --git a/content/about/people/megan/contents.lr b/content/about/people/megan/contents.lr new file mode 100644 index 0000000..286e92f --- /dev/null +++ b/content/about/people/megan/contents.lr @@ -0,0 +1,23 @@ +_model: person +--- +role: board +--- +name: Megan Price +--- +title: Director +--- +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). diff --git a/content/about/people/nighat/contents.lr b/content/about/people/nighat/contents.lr new file mode 100644 index 0000000..c051f03 --- /dev/null +++ b/content/about/people/nighat/contents.lr @@ -0,0 +1,22 @@ +_model: person +--- +role: board +--- +name: Nighat Dad +--- +title: Director +--- +nickname: nighat +--- +description: + +Nighat is the founder and Executive Director of the Digital Rights Foundation, +Pakistan. She is an accomplished lawyer and human rights activist. Nighat is a +pioneer for access to a safe and open Internet in Pakistan and globally. She was +a TED Global Fellow for 2017, was listed as one of TIME magazine's Next +Generation Leaders in 2015, and was the recipient of the Atlantic Council +Freedom Award and Human Rights Tulip Award. Nighat was also the only Pakistani +selected as a Young Global Leader by the World Economic Forum in 2018. Recently +her organization, the Digital Rights Foundation, was named among the 10 best +social entrepreneurs at the United Nations General Assembly 2018 meeting by +Forbes magazine. diff --git a/content/about/people/ohmygodel/contents.lr b/content/about/people/ohmygodel/contents.lr new file mode 100644 index 0000000..9fcb8a4 --- /dev/null +++ b/content/about/people/ohmygodel/contents.lr @@ -0,0 +1,13 @@ +_model: person +--- +role: core +--- +twitter_handle: ohmygodel +--- +name: Aaron Johnson +--- +nickname: ohmygodel +--- +description: + +NRL researcher in applied cryptography with an interest in Tor’s security and privacy. diff --git a/content/about/people/ramy/contents.lr b/content/about/people/ramy/contents.lr new file mode 100644 index 0000000..6d9a1bf --- /dev/null +++ b/content/about/people/ramy/contents.lr @@ -0,0 +1,29 @@ +_model: person +--- +role: board +--- +name: Ramy Raoof +--- +title: Director +--- +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. diff --git a/i18n/contents+en.po b/i18n/contents+en.po index 073950d..0271310 100644 --- a/i18n/contents+en.po +++ b/i18n/contents+en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-17 14:47+CET\n" +"POT-Creation-Date: 2019-01-09 14:50+CET\n" "PO-Revision-Date: 2018-09-19 22:39+CET\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -57,7 +57,7 @@ msgstr "" msgid "Tor Logo" msgstr "Tor Logo" -#: templates/people.html:168 +#: templates/people.html:31 msgid "Sign up for tor-dev" msgstr "" diff --git a/i18n/contents+es.po b/i18n/contents+es.po index 643c010..261c66f 100644 --- a/i18n/contents+es.po +++ b/i18n/contents+es.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-17 14:47+CET\n" +"POT-Creation-Date: 2019-01-09 14:50+CET\n" "PO-Revision-Date: 2018-09-24 16:29+0200\n" "Last-Translator: emmapeel <emma.peel(a)riseup.net>\n" "Language-Team: none\n" @@ -58,7 +58,7 @@ msgstr "" msgid "Tor Logo" msgstr "Tor Logo" -#: templates/people.html:168 +#: templates/people.html:31 msgid "Sign up for tor-dev" msgstr "" diff --git a/i18n/contents+fr.po b/i18n/contents+fr.po index 1a0170d..4830c3c 100644 --- a/i18n/contents+fr.po +++ b/i18n/contents+fr.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-17 14:47+CET\n" +"POT-Creation-Date: 2019-01-09 14:50+CET\n" "PO-Revision-Date: 2018-09-21 17:05+0200\n" "Last-Translator: emmapeel <emma.peel(a)riseup.net>\n" "Language-Team: none\n" @@ -57,7 +57,7 @@ msgstr "" msgid "Tor Logo" msgstr "Logo Tor" -#: templates/people.html:168 +#: templates/people.html:31 msgid "Sign up for tor-dev" msgstr "" diff --git a/i18n/contents.pot b/i18n/contents.pot index 49ba97c..30ee15e 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-19 13:51+CET\n" +"POT-Creation-Date: 2019-01-09 17:08+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -50,7 +50,7 @@ msgstr "" msgid "Tor Logo" msgstr "" -#: templates/people.html:168 +#: templates/people.html:31 msgid "Sign up for tor-dev" msgstr "" diff --git a/models/people.ini b/models/people.ini new file mode 100644 index 0000000..d7f8a86 --- /dev/null +++ b/models/people.ini @@ -0,0 +1,28 @@ +[model] +name = People +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 = person +order_by = nickname diff --git a/models/person.ini b/models/person.ini new file mode 100644 index 0000000..39b6fca --- /dev/null +++ b/models/person.ini @@ -0,0 +1,37 @@ +[model] +name = Person +label = {{ this.nickname }} +hidden = yes + +[fields.nickname] +label = Nickname +type = string + +[fields.twitter_handle] +label = Twitter Handle +type = string +addon_label = @ + +[fields.title] +label = Title +type = string + +[fields.role] +label = Role +type = string + +[fields.name] +label = Name +type = string + +[fields.description] +label = Description +type = markdown + +[fields.image] +label = Image +type = string + +[fields.pronoun] +label = Pronoun +type = string diff --git a/templates/macros/people.html b/templates/macros/people.html new file mode 100644 index 0000000..08edada --- /dev/null +++ b/templates/macros/people.html @@ -0,0 +1,20 @@ +{% macro render_board(item, alternative) %} + <div class="card p-3 m-3 border-0 col-5"> + <div class="card-body"> + <h5 class="card-title human-name">{{ item.name }}</h5> + <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.title }}</h6> + <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">{{ item.nickname }}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6> + <p class="card-text description">{{ item.description }}</p> + </div> + </div> +{% endmacro %} + +{% macro render_core(item, alternative) %} + <div class="card m-3 border-0 border-bottom border-light col-3"> + <div class="card-body"> + <h5 class="card-title human-name human-name-small">{{ item.name }}</h5> + <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">{{ item.nickname }}{% if item.pronoun %} - {{ item.pronoun }}{% endif %}{% if item.twitter_handle %} - <a href="https://twitter.com/{{ item.twitter_handle }}">@{{ item.twitter_handle }}</a>{% endif %}</h6> + <p class="card-text description description-small">{{ item.description }}</p> + </div> + </div> +{% endmacro %} diff --git a/templates/pagenav.html b/templates/pagenav.html index 13df10e..302960a 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -5,7 +5,7 @@ {% set menubag = this.section + '+' + this.alt %} {% for id, item in bag(menubag).items() %} <li{% if this.path == item.path %} class="nav-item active border-active" {% else %} class="nav-item"{% endif %}> - {% set item_path = site.get(item.path) %} + {% set item_path = site.get(item.path) %} <a class="nav-link" href="{{ this.url_to(item_path) }}">{{ item.label }} {% if this.path == item.path %} <span class="sr-only">(current)</span> diff --git a/templates/people.html b/templates/people.html index f188745..e4c07bc 100644 --- a/templates/people.html +++ b/templates/people.html @@ -3,48 +3,11 @@ </div> <div class="container col-10"> <div class="row"> - <div class="card p-3 m-3 border-0" style="width: 339px; height: 329px;"> - <div class="card-body"> - <h5 class="card-title human-name">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">Nickname</h6> - <p class="card-text description">Here a paragraph about this person's background. Lets keep the regular people two lines but we can go deep with leaders showing past achievements and roles. What do you think? Here a paragraph about this person's background.</p> - </div> - </div> - <div class="card p-3 m-3 border-0" style="width: 339px; height: 329px;"> - <div class="card-body"> - <h5 class="card-title human-name">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">Nickname</h6> - <p class="card-text description">Here a paragraph about this person's background. Lets keep the regular people two lines but we can go deep with leaders showing past achievements and roles. What do you think? Here a paragraph about this person's background.</p> - </div> - </div> - <div class="card p-3 m-3 border-0" style="width: 339px; height: 329px;"> - <div class="card-body"> - <h5 class="card-title human-name">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">Nickname</h6> - <p class="card-text description">Here a paragraph about this person's background. Lets keep the regular people two lines but we can go deep with leaders showing past achievements and roles. What do you think? Here a paragraph about this person's background.</p> - </div> - </div> - <div class="card p-3 m-3 border-0" style="width: 339px; height: 329px;"> - <div class="card-body"> - <h5 class="card-title human-name">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">Nickname</h6> - <p class="card-text description">Here a paragraph about this person's background. Lets keep the regular people two lines but we can go deep with leaders showing past achievements and roles. What do you think? Here a paragraph about this person's background.</p> - </div> - </div> - <div class="card p-3 m-3 border-0" style="width: 339px; height: 329px;"> - <div class="card-body"> - <h5 class="card-title human-name">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">Nickname</h6> - <p class="card-text description">Here a paragraph about this person's background. Lets keep the regular people two lines but we can go deep with leaders showing past achievements and roles. What do you think? Here a paragraph about this person's background.</p> - </div> - </div> - <div class="card p-3 m-3 border-0" style="width: 339px; height: 329px;"> - <div class="card-body"> - <h5 class="card-title human-name">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-capitalize">Nickname</h6> - <p class="card-text description">Here a paragraph about this person's background. Lets keep the regular people two lines but we can go deep with leaders showing past achievements and roles. What do you think? Here a paragraph about this person's background.</p> - </div> - </div> + {% from "macros/people.html" import render_board %} + {% set items = this.children %} + {% for item in items.filter(F.role == 'board') %} + {{ render_board(item, this.alt) }} + {% endfor %} </div> </div> <div class="container py-3"> @@ -52,111 +15,11 @@ </div> <div class="container col-10"> <div class="row"> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> - <div class="card m-3 border-0 border-bottom border-light" style="width: 200px; height: 200px;"> - <div class="card-body"> - <h5 class="card-title human-name human-name-small">Human Name</h5> - <h6 class="card-subtitle mb-2 text-primary nick text-lowercase">Nickname - pronoun</h6> - <p class="card-text description description-small">A quick paragraph about what are you doing at the tor project nowadays.</p> - </div> - </div> + {% from "macros/people.html" import render_core %} + {% set items = this.children %} + {% for item in items.filter(F.role == 'core') %} + {{ render_core(item, this.alt) }} + {% endfor %} </div> </div> <div class="container p-3 col-6"> diff --git a/templates/person.html b/templates/person.html new file mode 100644 index 0000000..040adc9 --- /dev/null +++ b/templates/person.html @@ -0,0 +1 @@ +{{ this.nickname }}

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Jan '19

09 Jan '19

commit d6786f2cd63d4789a2f52e1feb2ff674a2f397b7 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 15:15:47 2019 +0000 Update translations for https_everywhere_completed --- eo/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index bae0598c7..aed9455bc 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donaci al EFF"> <!ENTITY https-everywhere.menu.observatory "Agordoj de SSL-Observejo"> <!ENTITY https-everywhere.menu.globalEnable "Enŝalti HTTPS-Ĉie"> -<!ENTITY https-everywhere.menu.blockUnencryptedRequests "Bloki ĉiujn neĉifritajn petojn"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Ĉifri ĉiujn eblajn retejojn"> <!ENTITY https-everywhere.menu.showCounter "Montri nombrilon"> <!ENTITY https-everywhere.menu.viewAllRules "Montri ĉiujn regulojn">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Jan '19

09 Jan '19

commit f5b2805a9888674d0719e96522cd231c92395490 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 9 15:15:41 2019 +0000 Update translations for https_everywhere --- eo/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eo/https-everywhere.dtd b/eo/https-everywhere.dtd index 0791bf85c..aed9455bc 100644 --- a/eo/https-everywhere.dtd +++ b/eo/https-everywhere.dtd @@ -8,7 +8,7 @@ <!ENTITY https-everywhere.menu.donate_eff_imperative "Donaci al EFF"> <!ENTITY https-everywhere.menu.observatory "Agordoj de SSL-Observejo"> <!ENTITY https-everywhere.menu.globalEnable "Enŝalti HTTPS-Ĉie"> -<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Encrypt All Sites Eligible (EASE)"> +<!ENTITY https-everywhere.menu.encryptAllSitesEligible "Ĉifri ĉiujn eblajn retejojn"> <!ENTITY https-everywhere.menu.showCounter "Montri nombrilon"> <!ENTITY https-everywhere.menu.viewAllRules "Montri ĉiujn regulojn">

1 0

[torspec/master] Merge remote-tracking branch 'atagar/dropownership'
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit f6b588161e9a59740b111b4db4d642b126e1b995 Merge: ecbde01 1680b2e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 9 09:50:03 2019 -0500 Merge remote-tracking branch 'atagar/dropownership' control-spec.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)

1 0

[torspec/master] Add DROPOWNERSHIP command
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 1680b2e17e5f385923f9521c0f961ade45b76b4d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Dec 14 11:18:10 2018 -0800 Add DROPOWNERSHIP command New command added courtesy of Nick (thanks Nick!). https://trac.torproject.org/projects/tor/ticket/28843 --- control-spec.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index ae4a417..cdfd7c5 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1801,6 +1801,24 @@ [HSPOST was added in Tor 0.2.7.1-alpha] +3.23. DROPOWNERSHIP + + The syntax is: + "DROPOWNERSHIP" CRLF + + This command instructs Tor to relinquish ownership of its control + connection. As such tor will not shut down when this control + connection is closed. + + This method is idempotent. If the control connection does not + already have ownership this method returns successfully, and + does nothing. + + The controller can call TAKEOWNERSHIP again to re-establish + ownership. + + [DROPOWNERSHIP was added in Tor 0.4.0.0-alpha] + 4. Replies Reply codes follow the same 3-character format as used by SMTP, with the

1 0

[tor/master] Add a DROPOWNERSHIP controller command to undo TAKEOWNERSHIP.
by nickm＠torproject.org 09 Jan '19

09 Jan '19

commit 4bc3983f64ab2a60a79127f47573836373ddf587 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 13 19:35:02 2018 -0500 Add a DROPOWNERSHIP controller command to undo TAKEOWNERSHIP. Closes ticket 28843. --- changes/ticket28843 | 3 +++ src/feature/control/control.c | 23 +++++++++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/changes/ticket28843 b/changes/ticket28843 new file mode 100644 index 000000000..00905293c --- /dev/null +++ b/changes/ticket28843 @@ -0,0 +1,3 @@ + o Minor features (controller): + - Add a DROPOWNERSHIP command to undo the effects of TAKEOWNERSHIP. + Implements ticket 28843. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index c2da7fe48..50f43c0f4 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -1741,6 +1741,26 @@ handle_control_takeownership(control_connection_t *conn, uint32_t len, return 0; } +/** Called when we get a DROPOWNERSHIP command. Mark this connection + * as a non-owning connection, so that we will not exit if the connection + * closes. */ +static int +handle_control_dropownership(control_connection_t *conn, uint32_t len, + const char *body) +{ + (void)len; + (void)body; + + conn->is_owning_control_connection = 0; + + log_info(LD_CONTROL, "Control connection %d has dropped ownership of this " + "Tor instance.", + (int)(conn->base_.s)); + + send_control_done(conn); + return 0; +} + /** Return true iff <b>addr</b> is unusable as a mapaddress target because of * containing funny characters. */ static int @@ -5548,6 +5568,9 @@ connection_control_process_inbuf(control_connection_t *conn) } else if (!strcasecmp(conn->incoming_cmd, "TAKEOWNERSHIP")) { if (handle_control_takeownership(conn, cmd_data_len, args)) return -1; + } else if (!strcasecmp(conn->incoming_cmd, "DROPOWNERSHIP")) { + if (handle_control_dropownership(conn, cmd_data_len, args)) + return -1; } else if (!strcasecmp(conn->incoming_cmd, "MAPADDRESS")) { if (handle_control_mapaddress(conn, cmd_data_len, args)) return -1;

1 0