April 2018 - tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 09 Apr '18

09 Apr '18

commit d023cc967e5839bc7a76877de7319c6affcf75b8 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 9 03:15:44 2018 +0000 Update translations for https_everywhere_completed --- lo/https-everywhere.dtd | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lo/https-everywhere.dtd b/lo/https-everywhere.dtd index 953233df8..895605cb0 100644 --- a/lo/https-everywhere.dtd +++ b/lo/https-everywhere.dtd @@ -2,6 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS ທຸກໆບ່ອນ"> <!ENTITY https-everywhere.about.ext_description "ເຂົ້າລະຫັດເວັບ! ໃຊ້ ຄວາມປອດໄພ HTTPS ໃນຫລາຍໆເວັບໄຊຕ໌"> <!ENTITY https-everywhere.about.version "ເວີຊັນ"> +<!ENTITY https-everywhere.about.rulesets_version "ເວີຊັນ ຊຸດລະບຽບ ສຳລັບ"> <!ENTITY https-everywhere.about.add_new_rule "ເພີ່ມກົດໃຫມ່"> <!ENTITY https-everywhere.menu.donate_eff_imperative "ບໍລິຈາກໃຫ້ແກ່ EFF"> @@ -11,8 +12,12 @@ <!ENTITY https-everywhere.menu.showCounter "ສະແດງເຄື່ອງນັບ"> <!ENTITY https-everywhere.menu.viewAllRules "ສະແດງເບິ່ງກົດທັງໝົດ"> +<!ENTITY https-everywhere.options.generalSettings "ການຕັ້ງຄ່າທົ່ວໄປ"> +<!ENTITY https-everywhere.options.advancedSettings "ການຕັ້ງຄ່າຂັ້ນສູງ"> <!ENTITY https-everywhere.options.importSettings "ການຕັ້ງຄ່າການນຳເຂົ້າ"> <!ENTITY https-everywhere.options.import "ນໍາເຂົ້າ"> +<!ENTITY https-everywhere.options.enableMixedRulesets "ເປີດໃຊ້ຊຸດກົດລະບຽບເນື້ອໃນທີ່ປະສົມປະສານ"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "ປັບປຸງ ຊຸດກົດລະບຽບ ອັດຕະໂນມັດ"> <!ENTITY https-everywhere.options.imported "ການຕັ້ງຄ່າຂອງທ່ານໄດ້ຖືກນຳເຂົ້າແລ້ວ."> <!ENTITY https-everywhere.prefs.export_settings "ການຕັ້ງຄ່າການສົ່ງອອກ">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 09 Apr '18

09 Apr '18

commit 1e0afa96c96a4ea6e790a7f8f18b2d4c8d887ad7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Apr 9 03:15:35 2018 +0000 Update translations for https_everywhere --- lo/https-everywhere.dtd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lo/https-everywhere.dtd b/lo/https-everywhere.dtd index 3a6cb5a63..895605cb0 100644 --- a/lo/https-everywhere.dtd +++ b/lo/https-everywhere.dtd @@ -2,7 +2,7 @@ <!ENTITY https-everywhere.about.ext_name "HTTPS ທຸກໆບ່ອນ"> <!ENTITY https-everywhere.about.ext_description "ເຂົ້າລະຫັດເວັບ! ໃຊ້ ຄວາມປອດໄພ HTTPS ໃນຫລາຍໆເວັບໄຊຕ໌"> <!ENTITY https-everywhere.about.version "ເວີຊັນ"> -<!ENTITY https-everywhere.about.rulesets_version "Rulesets version for "> +<!ENTITY https-everywhere.about.rulesets_version "ເວີຊັນ ຊຸດລະບຽບ ສຳລັບ"> <!ENTITY https-everywhere.about.add_new_rule "ເພີ່ມກົດໃຫມ່"> <!ENTITY https-everywhere.menu.donate_eff_imperative "ບໍລິຈາກໃຫ້ແກ່ EFF"> @@ -12,12 +12,12 @@ <!ENTITY https-everywhere.menu.showCounter "ສະແດງເຄື່ອງນັບ"> <!ENTITY https-everywhere.menu.viewAllRules "ສະແດງເບິ່ງກົດທັງໝົດ"> -<!ENTITY https-everywhere.options.generalSettings "General Settings"> -<!ENTITY https-everywhere.options.advancedSettings "Advanced Settings"> +<!ENTITY https-everywhere.options.generalSettings "ການຕັ້ງຄ່າທົ່ວໄປ"> +<!ENTITY https-everywhere.options.advancedSettings "ການຕັ້ງຄ່າຂັ້ນສູງ"> <!ENTITY https-everywhere.options.importSettings "ການຕັ້ງຄ່າການນຳເຂົ້າ"> <!ENTITY https-everywhere.options.import "ນໍາເຂົ້າ"> -<!ENTITY https-everywhere.options.enableMixedRulesets "Enable mixed content rulesets"> -<!ENTITY https-everywhere.options.autoUpdateRulesets "Auto-update rulesets"> +<!ENTITY https-everywhere.options.enableMixedRulesets "ເປີດໃຊ້ຊຸດກົດລະບຽບເນື້ອໃນທີ່ປະສົມປະສານ"> +<!ENTITY https-everywhere.options.autoUpdateRulesets "ປັບປຸງ ຊຸດກົດລະບຽບ ອັດຕະໂນມັດ"> <!ENTITY https-everywhere.options.imported "ການຕັ້ງຄ່າຂອງທ່ານໄດ້ຖືກນຳເຂົ້າແລ້ວ."> <!ENTITY https-everywhere.prefs.export_settings "ການຕັ້ງຄ່າການສົ່ງອອກ">

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 08 Apr '18

08 Apr '18

commit ceee0aed6eea812fba495cac4e447cb24cd33968 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 8 23:45:28 2018 +0000 Update translations for whisperback_completed --- th/th.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/th.po b/th/th.po index 95dd2b9df..e570ce46c 100644 --- a/th/th.po +++ b/th/th.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-01-11 07:14+0000\n" -"Last-Translator: bact' <arthit(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-08 23:23+0000\n" +"Last-Translator: Acclaro Thailand <bkk-project(a)acclaro.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 08 Apr '18

08 Apr '18

commit 7c950e844fda4ac9d4cac83fc7319da1aa47b0ee Author: Translation commit bot <translation(a)torproject.org> Date: Sun Apr 8 23:45:21 2018 +0000 Update translations for whisperback --- th/th.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/th/th.po b/th/th.po index 95dd2b9df..e570ce46c 100644 --- a/th/th.po +++ b/th/th.po @@ -10,8 +10,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2018-01-11 07:14+0000\n" -"Last-Translator: bact' <arthit(a)gmail.com>\n" +"PO-Revision-Date: 2018-04-08 23:23+0000\n" +"Last-Translator: Acclaro Thailand <bkk-project(a)acclaro.com>\n" "Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[policies/master] Code of Conduct and Statement of Values
by atagar＠torproject.org 08 Apr '18

08 Apr '18

commit dfdb3518a1cdd9c3b4bad254ee470bb20cdff65d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 8 14:22:57 2018 -0700 Code of Conduct and Statement of Values --- code_of_conduct.txt | 289 ++++++++++++++++++++++++++ statement_of_values.txt | 61 ++++++ votes/18-03-26_code_of_conduct/coc_vote_1.txt | 183 ++++++++++++++++ votes/18-03-26_code_of_conduct/sov_vote_2.txt | 25 +++ votes/18-03-26_code_of_conduct/summary.txt | 135 ++++++++++++ 5 files changed, 693 insertions(+) diff --git a/code_of_conduct.txt b/code_of_conduct.txt new file mode 100644 index 0000000..5745f4d --- /dev/null +++ b/code_of_conduct.txt @@ -0,0 +1,289 @@ +============================================================ +Tor Project Code of Conduct +============================================================ + +Statement of Intent: + +The Tor Project is committed to fostering an inclusive environment and +community. Tor is a place where people should feel safe to engage, share their +point of view, and participate. + +This code of conduct applies to The Tor Project as a whole. It is intended to +provide guidelines for contributors. Employees and contractors of The Tor +Project, Inc. (TPI) are also subject to company policies and procedures. Those +people should feel free to contact HR with questions or concerns. + +This code of conduct is not exhaustive or complete. It is an ongoing effort to +summarize our shared understanding. We want to provide a welcoming, safe +environment, so we can work together to pursue powerful solutions. We reserve +the right to deviate from strictly enforcing this code. Any deviations must +produce an outcome which is fairer, and aligned with our values. We understand +that keeping a living document relevant and “patched” involves sustained +effort. + +============================================================ +0. Summary: Don't be a jerk. Be awesome instead. +============================================================ + +The Tor community should be a good place where people are glad to be. + + DO: Be kind, thoughtful, and considerate. + + DO: Make Tor a place where people are happy and comfortable. + + DO: Remember: We are all contributing; we are all learning. Nobody was born + an expert. + + DO: Yield the floor. Listen. Make sure everyone gets heard. + + DON'T: Insult, harass, intimidate, or be a jerk. + + DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for + learning. + + DON'T: Hunt for ways to uphold the letter of this code while violating its + spirit. + + AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with + questions or concerns. Public key: + https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact + +============================================================ +1. Purpose +============================================================ + +A primary goal of the Tor community is to be inclusive of many different +contributors. We want to include contributors from the most varied and diverse +backgrounds possible. As such, we are committed to providing a friendly, safe +and welcoming environment for all, regardless of their experience, gender +identity or expression, sexual orientation, family, relationships, ability +(whether bodily or mental), personal appearance, socioeconomic status, body +size, race, ethnicity, age, religion, nationality, or membership in a +disadvantaged and/or underrepresented group. + +A safe environment means one free from abuse, whether isolated or systemic. We +explicitly acknowledge that tolerating abuse is a security problem. Allowing +abusers and malicious people to disrupt our community puts our software, +developers, and users at risk. + +This code of conduct outlines our expectations for all those who participate in +our community, as well as the consequences for unacceptable behavior. + +We invite all those who participate in The Tor Project to help us create safe +and positive experiences for everyone. + +============================================================ +2. Be your best self +============================================================ + +The following behaviors are expected and requested of all community members: + + * Participate in an honest and active way. In doing so, you contribute to + the health and longevity of this community. + + * Exercise consideration and respect in your speech and actions. + + * Attempt collaboration and dialog before engaging in conflict. + + * Refrain from demeaning, discriminatory, or harassing behavior and speech. + + * Be mindful of your surroundings and of your fellow participants. Alert + community leaders if you notice: + + - a dangerous situation + + - someone in distress + + - violations of this code of conduct, even if they seem minor + + * Remember that community event venues may be shared with members of the + public. Please be respectful to everyone using these locations. + + * Respect the privacy of your fellow community members. + +============================================================ +3. Unacceptable behaviors +============================================================ + +The following behaviors are unacceptable within our community: + + * Violence, sexual assault, threats of violence, or violent language + directed against another person, especially violence against a person or + group based on a protected characteristic. (Display of weapons may + constitute intimidation or a threat of violence.) + + * Sexist, racist, homophobic, transphobic, ableist or otherwise + discriminatory jokes and language. + + * Spontaneously posting or displaying sexually explicit or violent + material. (If it is necessary to share such material when working on + Tor's mission, do so with sensitivity. Be aware that many people don't + want to see it.) + + * Posting or threatening to post other people’s personally identifying + information ("doxing") without their consent. + + * Personal insults or attacks, particularly those related to: + + - experience + + - gender identity or expression + + - sexual orientation + + - family + + - relationships + + - ability (whether bodily or mental) + + - personal appearance + + - socioeconomic status + + - body size + + - race + + - ethnicity + + - age + + - religion + + - nationality + + - membership in a disadvantaged and/or underrepresented group + + * Inappropriate photography, audio recording, or recording of personal + information. You should have someone's consent before recording these + things, and before posting them publicly. + + * Inappropriate physical contact. You should have someone’s consent before + touching them. + + * Unwelcome sexual attention: this includes sexualized comments or jokes, + inappropriate touching, groping, and unwelcome sexual advances. + + * Deliberate intimidation, stalking or following (online or in person). + + * Deliberately undermining the spirit of this code while following the + letter. + + * Sustained disruption of any community events, including talks, + presentations, and online conversations. + + * Deliberately pushing against someone's stated boundaries. + + * Advocating for, or encouraging, any of the above behavior. + +============================================================ +4. Unacceptable behavior has consequences +============================================================ + +We will not tolerate unacceptable behavior from any community member. We will +not make exceptions for sponsors and those with decision-making authority. +People in formal or informal leadership roles must model the highest standards +of behavior. + +Anyone asked by another community member to stop unacceptable behavior is +expected to comply immediately. Please don't step in on someone else's behalf +without their consent. + +============================================================ +5. Where to go for help +============================================================ + +The Community Council is an elected body of Tor Core Contributors who can +assist with intra-community conflict resolution. Community Council policies and +information can be found on the Community Council wiki [1]. You can contact +the whole Community council: + + - if you have questions or concerns about the code of conduct, or + + - if you feel that you have witnessed a code of conduct violation + +However, if you feel that there is a conflict of interest with any council +member, you may contact members individually. Council members' GPG keys are +listed on the Community Council wiki. If there is a conflict of interest, the +affected council member will recuse themselves. They will not be involved in +any discussion or documentation of the incident. More about the Community +Council can be found in the guidelines [2]. + +============================================================ +6. What to do if you witness unacceptable behavior +============================================================ + +If you are subject to or witness unacceptable behavior, or have any other +concerns, please notify the Community Council as soon as possible. You can +contact the community council in person, or at +tor-community-council(a)lists.torproject.org. Current councilmembers are listed +on the wiki [1]. The Community Council's incident response will vary on a +case-by-case basis. The council will make every effort to respond to the +incident immediately. The council will prioritize the safety of the person who +has been harmed, or is at risk of harm. Person(s) who have been harmed or are +at risk of harm can withdraw the incident report at any time. We will never do +anything without the consent of the person who has been harmed or is at risk of +harm, except in situations where there is a threat of imminent danger or harm +to anyone. More information about the Community Council's incident reporting +and response policies can be found on their wiki [1]. + +============================================================ +7. What the person reporting a violation can expect +============================================================ + +The Community Council prioritizes the safety and well-being of any person who +feels that they have been harmed or may be in danger of being harmed. Anyone +reporting an issue to the Community Council can expect that their report will +be taken seriously. Initial reports can be taken in written or verbal form. If +the incident does not require an immediate resolution, then a written report +can be shared with the Community Council in an encrypted format. The next steps +in an incident response will vary on a case-by-case basis. + +============================================================ +8. How the Community Council responds to incidents +============================================================ + +If a community member engages in unacceptable behavior, the Community Council +may take any action they deem appropriate, including but not limited to a +warning, informal mediation, temporary ban or permanent expulsion from the +community. Any actions and decisions by the Community Council may be appealed +by following the appeals process in the Community Council Guidelines [1]. + +============================================================ +9. Scope of this document +============================================================ + +This code of conduct covers all community participants: + + - paid and unpaid contributors + + - sponsors + + - other guests + +when interacting: + + - in all online and in-person community venues + + - in one-on-one communications that relate to community work + +This code of conduct and its related procedures also applies to unacceptable +behavior occurring outside the scope of community activities when such behavior +has the potential to adversely affect the safety and well-being of community +members. As members of the Tor community, we support and follow this Code while +we are working on Tor, and take care not to undermine it in the rest of our +time. + +============================================================ +10. License and attribution +============================================================ + +This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 +International license. + +This code of conduct uses some language and framing from the Citizen Code of +Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org + +[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil +[2] https://gitweb.torproject.org/community/policies.git/tree/community_council… diff --git a/statement_of_values.txt b/statement_of_values.txt new file mode 100644 index 0000000..9654172 --- /dev/null +++ b/statement_of_values.txt @@ -0,0 +1,61 @@ +============================================================ +Tor Project Statement of Core Contributor Values +============================================================ + +Community health is a shared responsibility. By making the community more +inclusive and welcoming, we build a stronger and more resilient Tor. Perfection +is not required; a commitment to continuous improvement and learning is. + +Our Social Contract defines our commitment to our users and the rest of the +world. This Statement of Values defines our commitment to ourselves as a +community of people working to build and improve Tor. This Statement of Values +quotes passages from the Social Contract to illustrate how the two documents +share underlying values. Some points from the Social Contract are omitted here +because they have less to do with how we treat each other internally. This +document is not a code of conduct; rather, it expresses the values that our +code of conduct seeks to implement. + + [Social Contract 1] We believe that privacy, the free exchange of ideas, + and access to information are essential to free societies. Through our + community standards and the code we write, we provide tools that help all + people protect and advance these rights. + +We aspire to live by these ideals in our community by always taking care to +treat each other with respect. We can only succeed in helping all people if we +succeed in treating all members of our community in a way that achieves fair +outcomes for everyone. The world (including the infosec and privacy +communities) is full of unjust systems. These systems, being unjust, +necessarily benefit some people and harm others. Those of us who receive those +benefits (like being taken more seriously, being criticized less, being safe +from certain kinds of harm) remain complicit in the injustice *unless* we +explicitly use our power to help those it harms. We all fail sometimes, but we +all must try to do better, especially when we have the power to do so. + +(This is what people mean by "privileged people have an obligation to help +people without that privilege." For more info, see "Unpacking the Invisible +Knapsack".) [1] + +We believe that everyone whose values and goals align with ours should feel +welcome and safe in our community, regardless of their experience, gender +identity or expression, sexual orientation, family, relationships, ability +(whether mental or physical), personal appearance, socioeconomic status, body +size, race, ethnicity, age, religion, nationality, or membership in a +disadvantaged and/or underrepresented group. + + [Social Contract 3] The more diverse our users, the less is implied about + any person by simply being a Tor user. This diversity is a fundamental goal + and we aim to create tools and services anyone can access and use. + +We want to grow an inclusive and diverse community of people working on Tor. A +diverse community helps us achieve our goals of making our tools usable by a +diverse user population. + +We are a community of people who care passionately about human rights such as +privacy, freedom of expression, and freedom of association. We need to be +careful how we apply our social rules. Applying rigid rules to people can +worsen existing injustice. After all, a rule can be neutral in principle, but +not neutral in fact. As we formulate and apply our policies, we must remember +that our rules are made to create a safe, fair, and respectful community, and +that they have value only to the extent that they serve that goal. + +[1] https://nationalseedproject.org/white-privilege-unpacking-the-invisible-kna… diff --git a/votes/18-03-26_code_of_conduct/coc_vote_1.txt b/votes/18-03-26_code_of_conduct/coc_vote_1.txt new file mode 100644 index 0000000..61c5610 --- /dev/null +++ b/votes/18-03-26_code_of_conduct/coc_vote_1.txt @@ -0,0 +1,183 @@ +Tor Project Code of Conduct v 0.1 +================================= + +Statement of Intent: + +The Tor Project is committed to fostering an inclusive environment and community. Tor is a place where people should feel safe to engage, share their point of view, and participate. + +This code of conduct applies to The Tor Project as a whole. It is intended to provide guidelines for contributors. Employees and contractors of The Tor Project, Inc. (TPI) are also subject to company policies and procedures. Those people should feel free to contact HR with questions or concerns. + +This code of conduct is not exhaustive or complete. It is an ongoing effort to summarize our shared understanding. We want to provide a welcoming, safe environment, so we can work together to pursue powerful solutions. We reserve the right to deviate from strictly enforcing this code. Any deviations must produce an outcome which is fairer, and aligned with our values. We understand that keeping a living document relevant and “patched” involves sustained effort. + +0. Summary: Don't be a jerk. Be awesome instead. + +The Tor community should be a good place where people are glad to be. + +DO: Be kind, thoughtful, and considerate. + +DO: Make Tor a place where people are happy and comfortable. + +DO: Remember: We are all contributing; we are all learning. Nobody was born an expert. + +DO: Yield the floor. Listen. Make sure everyone gets heard. + +DON'T: Insult, harrass, intimidate, or be a jerk. + +DON'T: Treat honest mistakes as an excuse to hassle people. Mistakes are for learning. + +DON'T: Hunt for ways to uphold the letter of this code while violating its spirit. + +AND DO: Eagerly email: tor-community-council(a)lists.torproject.org with questions or concerns. Public key: https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil#Contact + +1. Purpose + +A primary goal of the Tor community is to be inclusive of many different contributors. We want to include contributors from the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of their experience, gender identity or expression, sexual orientation, family, relationships, ability (whether bodily or mental), personal appearance, socioeconomic status, body size, race, ethnicity, age, religion, nationality, or membership in a disadvantaged and/or underrepresented group. + +A safe environment means one free from abuse, whether isolated or systemic. We explicitly acknowledge that tolerating abuse is a security problem. Allowing abusers and malicious people to disrupt our community puts our software, developers, and users at risk. + +This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior. + +We invite all those who participate in The Tor Project to help us create safe and positive experiences for everyone. + +2. Be your best self + +The following behaviors are expected and requested of all community members: + + * Participate in an honest and active way. In doing so, you contribute to the health and longevity of this community. + + * Exercise consideration and respect in your speech and actions. + + * Attempt collaboration and dialog before engaging in conflict. + + * Refrain from demeaning, discriminatory, or harassing behavior and speech. + + * Be mindful of your surroundings and of your fellow participants. Alert community leaders if you notice: + + - a dangerous situation + + - someone in distress + + - violations of this code of conduct, even if they seem minor + + * Remember that community event venues may be shared with members of the public. Please be respectful to everyone using these locations. + + * Respect the privacy of your fellow community members. + + +3. Unacceptable behaviors + +The following behaviors are unacceptable within our community: + + * Violence, sexual assault, threats of violence, or violent language directed against another person, especially violence against a person or group based on a protected characteristic. (Display of weapons may constitute intimidation or a threat of violence.) + + * Sexist, racist, homophobic, transphobic, ableist or otherwise discriminatory jokes and language. + + * Spontaneously posting or displaying sexually explicit or violent material. (If it is necessary to share such material when working on Tor's mission, do so with sensitivity. Be aware that many people don't want to see it.) + + * Posting or threatening to post other people’s personally identifying information ("doxing") without their consent. + + * Personal insults or attacks, particularly those related to: + + - experience + + - gender identity or expression + + - sexual orientation + + - family + + - relationships + + - ability (whether bodily or mental) + + - personal appearance + + - socioeconomic status + + - body size + + - race + + - ethnicity + + - age + + - religion + + - nationality + + - membership in a disadvantaged and/or underrepresented group + + * Inappropriate photography, audio recording, or recording of personal information. You should have someone's consent before recording these things, and before posting them publicly. + + * Inappropriate physical contact. You should have someone’s consent before touching them. + + * Unwelcome sexual attention: this includes sexualized comments or jokes, inappropriate touching, groping, and unwelcome sexual advances. + + * Deliberate intimidation, stalking or following (online or in person). + + * Deliberately undermining the spirit of this code while following the letter. + + * Sustained disruption of any community events, including talks, presentations, and online conversations. + + * Deliberately pushing against someone's stated boundaries. + + * Advocating for, or encouraging, any of the above behavior. + + +4. Unacceptable behavior has consequences + +We will not tolerate unacceptable behavior from any community member. We will not make exceptions for sponsors and those with decision-making authority. People in formal or informal leadership roles must model the highest standards of behavior. + +Anyone asked by another community member to stop unacceptable behavior is expected to comply immediately. Please don't step in on someone else's behalf without their consent. + +5. Where to go for help + +The Community Council is an elected body of Tor Core Contributors who can assist with intra-community conflict resolution. Community Council policies and information can be found on the Community Council wiki [1]. +You can contact the whole Community council: + + - if you have questions or concerns about the code of conduct, or + + - if you feel that you have witnessed a code of conduct violation + +However, if you feel that there is a conflict of interest with any council member, you may contact members individually. Council members' GPG keys are listed on the Community Council wiki. If there is a conflict of interest, the affected council member will recuse themselves. They will not be involved in any discussion or documentation of the incident. More about the Community Council can be found in the guidelines [2]. + +6. What to do if you witness unacceptable behavior + +If you are subject to or witness unacceptable behavior, or have any other concerns, please notify the Community Council as soon as possible. You can contact the community council in person, or at tor-community-council(a)lists.torproject.org. Current councilmembers are listed on the wiki [1]. The Community Council's incident response will vary on a case-by-case basis. The council will make every effort to respond to the incident immediately. The council will prioritize the safety of the person who has been harmed, or is at risk of harm. Person(s) who have been harmed or are at risk of harm can withdraw the incident report at any time. We will never do anything without the consent of the person who has been harmed or is at risk of harm, except in situations where there is a threat of imminent danger or harm to anyone. More information about the Community Council's incident reporting and response policies can be found on their wiki [1]. + +7. What the person reporting a violation can expect + +The Community Council prioritizes the safety and well-being of any person who feels that they have been harmed or may be in danger of being harmed. Anyone reporting an issue to the Community Council can expect that their report will be taken seriously. Initial reports can be taken in written or verbal form. If the incident does not require an immediate resolution, then a written report can be shared with the Community Council in an encrypted format. The next steps in an incident response will vary on a case-by-case basis. + +8. How the Community Council responds to incidents + +If a community member engages in unacceptable behavior, the Community Council may take any action they deem appropriate, including but not limited to a warning, informal mediation, temporary ban or permanent expulsion from the community. Any actions and decisions by the Community Council may be appealed by following the appeals process in the Community Council Guidelines [1]. + +9. Scope of this document + +This code of conduct covers all community participants: + + - paid and unpaid contributors + + - sponsors + + - other guests + +when interacting: + + - in all online and in-person community venues + + - in one-on-one communications that relate to community work + + +This code of conduct and its related procedures also applies to unacceptable behavior occuring outside the scope of community activities when such behavior has the potential to adversely affect the safety and well-being of community members. As members of the Tor community, we support and follow this Code while we are working on Tor, and take care not to undermine it in the rest of our time. + +10. License and attribution + +This code of conduct is shared under a Creative Commons CC-BY-SA 4.0 International license. + +This code of conduct uses some language and framing from the Citizen Code of Conduct, which is shared under a CC-BY-SA license: citizencodeofconduct.org + +[1] https://trac.torproject.org/projects/tor/wiki/org/CommunityCouncil +[2] https://gitweb.torproject.org/community/policies.git/tree/community_council… diff --git a/votes/18-03-26_code_of_conduct/sov_vote_2.txt b/votes/18-03-26_code_of_conduct/sov_vote_2.txt new file mode 100644 index 0000000..351b3b6 --- /dev/null +++ b/votes/18-03-26_code_of_conduct/sov_vote_2.txt @@ -0,0 +1,25 @@ +Tor Project Statement of Core Contributor Values + +Community health is a shared responsibility. By making the community more inclusive and welcoming, we build a stronger and more resilient Tor. Perfection is not required; a commitment to continuous improvement and learning is. + +Our Social Contract defines our commitment to our users and the rest of the world. This Statement of Values defines our commitment to ourselves as a community of people working to build and improve Tor. This Statement of Values quotes passages from the Social Contract to illustrate how the two documents share underlying values. Some points from the Social Contract are omitted here because they have less to do with how we treat each other internally. This document is not a code of conduct; rather, it expresses the values that our code of conduct seeks to implement. + + [Social Contract 1] We believe that privacy, the free exchange of ideas, and access to information are essential to free societies. Through our community standards and the code we write, we provide tools that help all people protect and advance these rights. + + +We aspire to live by these ideals in our community by always taking care to treat each other with respect. We can only succeed in helping all people if we succeed in treating all members of our community in a way that achieves fair outcomes for everyone. The world (including the infosec and privacy communities) is full of unjust systems. These systems, being unjust, necessarily benefit some people and harm others. Those of us who receive those benefits (like being taken more seriously, being criticized less, being safe from certain kinds of harm) remain complicit in the injustice *unless* we explicitly use our power to help those it harms. We all fail sometimes, but we all must try to do better, especially when we have the power to do so. + +(This is what people mean by "privileged people have an obligation to help people without that privilege." For more info, see "Unpacking the Invisible Knapsack". [1] + +We believe that everyone whose values and goals align with ours should feel welcome and safe in our community, regardless of their experience, gender identity or expression, sexual orientation, family, relationships, ability (whether mental or physical), personal appearance, socioeconomic status, body size, race, ethnicity, age, religion, nationality, or membership in a disadvantaged and/or underrepresented group. + + + [Social Contract 3] The more diverse our users, the less is implied about any person by simply being a Tor user. This diversity is a fundamental goal and we aim to create tools and services anyone can access and use. + + +We want to grow an inclusive and diverse community of people working on Tor. A diverse communty helps us achieve our goals of making our tools usable by a diverse user population. + +We are a community of people who care passionately about human rights such as privacy, freedom of expression, and freedom of association. We need to be careful how we apply our social rules. Applying rigid rules to people can worsen existing injustice. After all, a rule can be neutral in principle, but not neutral in fact. As we formulate and apply our policies, we must remember that our rules are made to create a safe, fair, and respectful community, and that they have value only to the extent that they serve that goal. + + +[1] https://nationalseedproject.org/white-privilege-unpacking-the-invisible-kna… diff --git a/votes/18-03-26_code_of_conduct/summary.txt b/votes/18-03-26_code_of_conduct/summary.txt new file mode 100644 index 0000000..65f3a0b --- /dev/null +++ b/votes/18-03-26_code_of_conduct/summary.txt @@ -0,0 +1,135 @@ +===================================================================== +Summary +===================================================================== + +Topic: Code of Conduct and Statement of Values +Date taken: 18/3/26 - 18/4/8 +Vote count: 32 (of 92 eligible voters, 35%) + +Secretary: Karsten Loesing +Proposer: Alison Macrina + +Topic put to a vote were... + + Question 1: Code of Conduct + + Please choose one of the following options for the *Code of Conduct*: + + a. I approve of the proposal. + + b. I do not approve of the proposal. + + c. I abstain from this vote. + + Question 2: Statement of Values + + Please choose one of the following options for the *Statement of Values*: + + a. I approve of the proposal. + + b. I do not approve of the proposal. + + c. I abstain from this vote. + +Results were... + + * Code of Conduct passes. 97% approved of its adoption. + + * Statement of Values passes. 93% approved of its adoption. + +===================================================================== +Votes +===================================================================== + +Alison Macrina +Allen Gunn +Antonela Debiasi +Colin Childs +Damian Johnson +David Goulet +Georg Koppen +George Kadianakis +hiro +Ian Goldberg +isabela +isis +kat +Kathleen Brade +Mark Smith +Matt Traudt +Matthew Finkel +micah +Mike Perry +Moritz Bartl +Nick Mathewson +Richard Pospesel +Rob Jansen +Roger Dingledine +Sukhbir Singh +Taylor Yu +teor +Tom Ritter +Tommy Collison +Vasilis +Wendy Seltzer +Yawning Angel + +419;A;A +1087;A;A +1494;A;A +1857;A;A +2535;A;A +4448;A;A +6439;A;A +7205;A;A +8458;A;A +11777;A;A +12015;A;A +12492;A;A +12810;A;A +14641;A;A +14681;A;A +15047;<abstain>;<abstain> +15429;A;A +15887;A;B +16362;A;A +17747;A;A +18248;A;A +19022;A;A +21773;A;A +23496;<abstain>;<abstain> +24887;B;B +26266;A;A +26510;A;A +26754;A;A +29447;A;A +30953;A;A +31419;A;A +31717;A;A + +===================================================================== +Question 1: Code of Conduct +===================================================================== + +Approve: 29 (97%) +Reject: 1 (3%) + +--------------------------------------------------------------------- +Result: +--------------------------------------------------------------------- + +Motion passes. We'll adopt this as our code of conduct. + +===================================================================== +Question 2: Statement of Values +===================================================================== + +Approve: 28 (93%) +Reject: 2 (7%) + +--------------------------------------------------------------------- +Result: +--------------------------------------------------------------------- + +Motion passes. We'll adopt this as our statment of values. +

1 0

[nyx/master] Add 'How do I get started?' to the FAQ
by atagar＠torproject.org 08 Apr '18

08 Apr '18

commit d46950c6d2ec1dbb867352904fad08f922ef2331 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 7 19:18:45 2018 -0700 Add 'How do I get started?' to the FAQ I've had 'explain how to get nyx set up' on my todo list for quite a while. Basic question we should answer. Thankfully it's easy. :P --- web/index.html | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/web/index.html b/web/index.html index 50eae11..5ef6afc 100644 --- a/web/index.html +++ b/web/index.html @@ -118,6 +118,23 @@ </div> </li> + <li id="getting_started"> + How do I get started? + <div class="answer"> + Getting started with Nyx is easy! + <ol> + <li><a href="#download">Install Nyx.</a></li> + <li> + Open a Tor ControlPort for Nyx to connect with. + <a href="https://www.torproject.org/projects/torbrowser.html.en">Tor Browser</a> provides this out of the box. Otherwise, add the following lines to your <a href="https://www.torproject.org/docs/faq.html.en#torrc">torrc</a> and restart tor... + <pre>ControlPort 9051 CookieAuthentication 1</pre> +   + </li> + <li>Run "nyx" on your commandline. That's it!</li> + </ol> + </div> + </li> + <li id="why_is_it_called_nyx"> Why is it called Nyx? <div class="answer"> @@ -284,8 +301,8 @@ FetchUselessDescriptors 1</pre> <ul class="questions"> - <li id="getting_started"> - How do I get started? + <li id="getting_involved"> + How can I get involved? <div class="answer"> The best way of getting involved with any project is to jump right in! In particular look for the 'easy' keyword on our <a href="http://trac.torproject.org/projects/tor/wiki/doc/nyx/bugs">bug tracker</a> for a handy spot to start. Got questions? I'm atagar on <a href="http://www.oftc.net/">oftc</a> and available <a href="https://www.atagar.com/contact/">via email</a>. To get started...

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 07 Apr '18

07 Apr '18

commit 911f6d9b95790d0d06a1d7e6af617700dff08d1b Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 7 23:48:06 2018 +0000 Update translations for tails-openpgp-applet --- ti/openpgp-applet.pot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ti/openpgp-applet.pot b/ti/openpgp-applet.pot index e3d2bc7e9..741679775 100644 --- a/ti/openpgp-applet.pot +++ b/ti/openpgp-applet.pot @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2017-08-05 15:07-0400\n" -"PO-Revision-Date: 2018-04-07 21:19+0000\n" +"PO-Revision-Date: 2018-04-07 23:43+0000\n" "Last-Translator: Thewodros Aregay <teddywa8(a)yahoo.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Apr '18

07 Apr '18

commit acae451319eb22118cef92b5e9930ed67716faf1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 7 23:46:38 2018 +0000 Update translations for tails-misc --- ti.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ti.po b/ti.po index 3e18dbb74..d6d5134f7 100644 --- a/ti.po +++ b/ti.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-07 23:12+0000\n" +"PO-Revision-Date: 2018-04-07 23:43+0000\n" "Last-Translator: Thewodros Aregay <teddywa8(a)yahoo.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 07 Apr '18

07 Apr '18

commit bdc06de4f0f739b88629ffb61c5d939b42958f71 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 7 23:46:07 2018 +0000 Update translations for mat-gui --- ti.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ti.po b/ti.po index 4cf3a1c83..45c4dc788 100644 --- a/ti.po +++ b/ti.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2018-02-20 18:56+0000\n" -"Last-Translator: Tewelde Tesfagabir <ttesfag(a)voanews.com>\n" +"PO-Revision-Date: 2018-04-07 23:43+0000\n" +"Last-Translator: Thewodros Aregay <teddywa8(a)yahoo.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Apr '18

07 Apr '18

commit 7ea1217d1cd21bd5e421eedc7abfaa6150e3ed72 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Apr 7 23:16:38 2018 +0000 Update translations for tails-misc --- ti.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ti.po b/ti.po index fbb71a27e..3e18dbb74 100644 --- a/ti.po +++ b/ti.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-03-13 02:48+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-04-07 23:12+0000\n" +"Last-Translator: Thewodros Aregay <teddywa8(a)yahoo.com>\n" "Language-Team: Tigrinya (http://www.transifex.com/otf/torproject/language/ti/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0