tor-commits March 2021

tor-commits@lists.torproject.org

17 participants
2169 discussions

[community/staging] giving netbsd's bridge setup a new KEY id.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit d5c38f5e3d4b529bc7c6973fff4f24d42409c058 Author: Vinicius Zavam <egypcio(a)googlemail.com> Date: Fri Oct 18 15:17:05 2019 +0000 giving netbsd's bridge setup a new KEY id. --- content/relay-operations/technical-setup/bridge/netbsd/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr index 8262eda..41f7b46 100644 --- a/content/relay-operations/technical-setup/bridge/netbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/netbsd/contents.lr @@ -6,7 +6,7 @@ title: NetBSD --- html: two-columns-page.html --- -key: 3 +key: 6 --- body:

1 0

[community/staging] Not all pages are hidden
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit b2df2aa3ca13e86af733e8b1c4257df83e8a8415 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:16:26 2019 +0200 Not all pages are hidden --- content/user-research/become-tester/contents.lr | 2 ++ templates/user-research.html | 8 ++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 7025245..5dfa354 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- +_hidden: yes +--- _template: layout.html --- html: two-columns-page.html diff --git a/templates/user-research.html b/templates/user-research.html index e12fa62..9f29641 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,17 @@ </div> </div> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {% if child.title == "Become a Tester" %} + <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa">{{ _(child.title) }}</a> + {% else %} + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {% endif %} </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[community/staging] Revert "Update user-research section to include hidden content"
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 2d275464a50e6a4ba69614609df0be3e3d871325 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:07:17 2019 +0200 Revert "Update user-research section to include hidden content" This reverts commit c7309bc6e56a51d5e648fc7990671b2d589de1e6. --- content/user-research/become-tester/contents.lr | 4 +++- content/user-research/contents.lr | 2 -- content/user-research/guidelines/contents.lr | 4 ++-- content/user-research/open/contents.lr | 4 ++-- templates/two-columns-page.html | 2 +- templates/user-research.html | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 9540db2..7025245 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,6 +8,8 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -discoverable: no +_template: layout.html +--- +html: two-columns-page.html --- body: diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index e6fb45d..2ad1aeb 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -21,5 +21,3 @@ body: ## We respect our users' privacy when we conduct research. We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research. ---- -_discoverable: yes diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index d6256ca..247654c 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,10 +8,10 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -_discoverable: yes ---- key: 3 --- +html: two-columns-page.html +--- body: Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board! diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index 5aacad2..c1f5c1a 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,10 +12,10 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -_discoverable: yes ---- key: 2 --- +html: two-columns-page.html +--- body: These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines). diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 3c6832b..5151905 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -6,7 +6,7 @@ <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} <div class="row"> - {% for child in this.children.include_hidden(true)|sort(attribute='key') %} + {% for child in this.children|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> diff --git a/templates/user-research.html b/templates/user-research.html index 7d6bd13..e12fa62 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,13 @@ </div> </div> <div class="row"> - {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} + {% for child in this.children|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - {{ _(child.title) }} + <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[community/staging] update content
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 8b765e8d11300b913673075b5a6305fcef2d3110 Author: Antonela <hola(a)antonela.me> Date: Sat Oct 19 09:59:10 2019 -0300 update content steph's review. Close #103 https://dip.torproject.org/steph/community/blob/develop/content/user-resear… --- content/user-research/contents.lr | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 5787f2c..2ad1aeb 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -8,7 +8,7 @@ _template: layout.html --- title: User Research --- -subtitle: We conduct user research while also respecting user privacy. +subtitle: We respect our users' privacy when we conduct research. --- cta: Learn about Tor users --- @@ -18,6 +18,6 @@ html: user-research.html --- body: -## We conduct user research while also respecting user privacy. +## We respect our users' privacy when we conduct research. -We practice human-centered design on building tools for internet freedom while we build community. Our user research is funded by the premises of consent, respect, and empathy. Make an impact in your local community by listening to our users. Learn how we do it and help Tor with user research. +We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research.

1 0

[community/staging] Revert previous commit and fix conflicts
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 89f7bff151c6fda4611c2b5351f35bbea6052350 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:21:09 2019 +0200 Revert previous commit and fix conflicts --- content/user-research/become-tester/contents.lr | 4 ---- content/user-research/guidelines/contents.lr | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 5dfa354..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -10,8 +10,4 @@ key: 1 --- _hidden: yes --- -_template: layout.html ---- -html: two-columns-page.html ---- body: diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 247654c..66ad447 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,6 +8,7 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- +>>>>>>> parent of 1e624ba... update content status key: 3 --- html: two-columns-page.html

1 0

[community/staging] Use id not title
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 1fd10281307c8a07d9945e7881e517c1824551aa Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:23:45 2019 +0200 Use id not title --- templates/user-research.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/user-research.html b/templates/user-research.html index 9f29641..339cca3 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -14,7 +14,7 @@ <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - {% if child.title == "Become a Tester" %} + {% if child._id == "become-tester" %} <a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-qa">{{ _(child.title) }}</a> {% else %} <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a>

1 0

[community/staging] Update link for Tor FAQ
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 55e30a679931a6aabb294a1beb8e8101357d22d8 Author: IvetaHron <48660940+IvetaHron(a)users.noreply.github.com> Date: Tue Oct 22 16:42:18 2019 +0100 Update link for Tor FAQ Update link for Tor FAQ to Support portal. --- content/relay-operations/community-resources/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/community-resources/contents.lr b/content/relay-operations/community-resources/contents.lr index 3a83530..f2e2f0e 100644 --- a/content/relay-operations/community-resources/contents.lr +++ b/content/relay-operations/community-resources/contents.lr @@ -95,6 +95,6 @@ Congratulations, you're officially a Tor relay operator! What now? * You can check out traffic and other statistics for your relay at our [Relay Search](https://metrics.torproject.org/rs.html) (your relay will appear on "Relay Search" about 3 hours after you started it). -* There is also more info about running a relay at the [Tor FAQ](https://2019.www.torproject.org/docs/faq.html.en#HowDoIDecide). +* There is also more info about running a relay at the [Tor FAQ](https://support.torproject.org/operators/). * And, most importantly, make sure to email tshirt(a)torproject.org and [claim your swag](swag). It's our way of saying thanks for defending privacy and free speech online.

1 0

[community/staging] punctuation and capitalization edits
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 2accd20efbce6167fbbbc8a1d28b30379fb0dd19 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Thu Oct 31 19:16:51 2019 +0000 punctuation and capitalization edits --- content/training/checklist/contents.lr | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/content/training/checklist/contents.lr b/content/training/checklist/contents.lr index 5712680..601ca09 100644 --- a/content/training/checklist/contents.lr +++ b/content/training/checklist/contents.lr @@ -1,28 +1,28 @@ _model: page --- -title: Training checklist +title: Training Checklist --- body: -Use this checklist to run a Tor Training. +Complete this checklist before running a Tor training. -## Get prepared +## Prepare - [ ] I read and agree with the Tor Project [Code of Coduct](https://community.torproject.org/training/code-of-conduct/) + [ ] I read and agree with the Tor Project [Code of Coduct](https://community.torproject.org/training/code-of-conduct/) - [ ] I read the Trainers Guide + [ ] I read the Trainers Guide [ ] I have an agenda for the training [ ] I reviewed the training slides -## Security protocol +## Security Protocol [ ] I already contacted my organization and told them that I'm organizing this training [ ] I shared a contact to whom my organization should call if something happens -## About the venue +## About the Venue [ ] The venue has enough tables and chairs to everyone @@ -38,7 +38,7 @@ Use this checklist to run a Tor Training. [ ] I have confirmed participants for the training -## During the training +## During the Training Before starting the training, make sure you: @@ -50,7 +50,7 @@ Before starting the training, make sure you: [ ] "All questions are welcome" -## After the training +## After the Training [ ] Collect participants feedback @@ -70,6 +70,6 @@ section: Training --- section_id: training --- -subtitle: Based on our best practices, we have a training checklist to help you +subtitle: Based on our best practices, we have a checklist to help you prepare to conduct your training. --- key: 4

1 0

[community/staging] grammar, flow, and punctuation edits
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 76f2f7bfbfe4c978aa65dd742633822f016ac800 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Thu Oct 31 19:21:36 2019 +0000 grammar, flow, and punctuation edits --- content/training/faq/contents.lr | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/content/training/faq/contents.lr b/content/training/faq/contents.lr index 69a2d72..85ed923 100644 --- a/content/training/faq/contents.lr +++ b/content/training/faq/contents.lr @@ -4,23 +4,23 @@ title: Tor Training FAQ --- body: -After running a couple of Tor training, you will find out that first time users have some similar questions about Tor. -Here we aggregate the most frequent questions that we listened during our training sessions and you must be aware before running your training. -For an extensive resource check [Support portal](https://support.torproject.org). +After running a couple of Tor trainings, you will find that first time users have some similar questions about Tor. +These are the most frequent questions we hear during our training sessions. Be prepared for them before running your training. +For an extensive resource, check [Support portal](https://support.torproject.org). * [Why is it called Tor?](https://support.torproject.org/about/why-is-it-called-tor/) * [Does using Tor Browser protect other applications on my computer?](https://support.torproject.org/tbb/tbb-13/) - * [Using Tor with a VPN is more secure?](https://support.torproject.org/faq/faq-5/) - * [Can I browse normal HTTPS sites with Tor?](https://support.torproject.org/https/https-2/) + * [Is using Tor with a VPN more secure?](https://support.torproject.org/faq/faq-5/) + * [Can I browse HTTPS sites with Tor?](https://support.torproject.org/https/https-2/) * [Is it possible to find out the path that a client is taking on the Tor Network?](https://support.torproject.org/misc/misc-1/) * [Why don't you prevent bad people from doing bad things when using Tor?](https://support.torproject.org/misc/misc-2/) * [When I use Tor Browser, will anyone be able to tell which websites I visit?](https://support.torproject.org/tbb/tbb-3/) * [Why did my search engine switch to DuckDuckGo? Or what is DuckDuckGo?](https://support.torproject.org/tbb/tbb-41/) * [What is a bridge?](https://support.torproject.org/censorship/censorship-7/) * [Tor Browser won't connect, but it doesn’t seem to be an issue with censorship.](https://support.torproject.org/tbb/tbb-20/) - * [What is the difference between using Tor Browser and 'Incognito mode' or private tabs? ](https://support.torproject.org/tbb/tbb-and-incognito-mode/) + * [What is the difference between using Tor Browser and 'incognito mode' or private tabs? ](https://support.torproject.org/tbb/tbb-and-incognito-mode/) * [Does running Tor Browser make me a relay?](https://support.torproject.org/tbb/tbb-33/) - * [Who funds Tor](https://support.torproject.org/misc/misc-3/) + * [Who funds Tor?](https://support.torproject.org/misc/misc-3/) * [Is there a backdoor in Tor?](https://support.torproject.org/about/backdoor/) --- @@ -36,4 +36,4 @@ section_id: training --- subtitle: -You probably should know these answers before teaching about Tor +People new to Tor often ask similar questions, and we can help you prepare for answering them.

1 0

[community/staging] small edits
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 6577591736b8b16e90a48972ffe457d63f746012 Author: Stephanie A. Whited <steph(a)torproject.org> Date: Fri Oct 11 20:04:39 2019 +0000 small edits --- content/onion-services/setup/contents.lr | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index a33df07..5389808 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -8,7 +8,7 @@ image: cloud-upload-alt --- _template: layout.html --- -title: Set up your Onion Service +title: Set up Your Onion Service --- subtitle: Learn how to set up a .onion site of your very own. --- @@ -20,11 +20,11 @@ html: two-columns-page.html --- body: -This guide will go over setting up an onion service for your website: +This guide shows you how to set up an onion service for your website. ## Step 0: Get a working Tor -As part of this guide we will assume you have a functional Tor in your machine. Tor should be up and running correctly for this guide to work. You should also know where Tor's configuration files are. +As part of this guide, we will assume you have a functional Tor in your machine. Tor should be up and running correctly for this guide to work. You should also know where Tor's configuration files are. To setup Tor, Windows users can follow the [Windows howto](https://2019.www.torproject.org/docs/tor-doc-windows.html.en), OS X users should follow the [OS X howto](https://2019.www.torproject.org/docs/tor-doc-osx.html.en), and Linux/BSD/Unix users should follow the [Unix howto](https://2019.www.torproject.org/docs/tor-doc-unix.html.en). @@ -61,18 +61,18 @@ Now save your `torrc` and restart Tor. If Tor starts up again, great. Otherwise, something is wrong. First look at your logfiles for hints. It will print some warnings or error messages. That should give you an idea what went wrong. -Typically there are typos in the torrc or wrong directory permissions (See the logging FAQ [FIXME add link] entry if you don't know how to enable or find your log file.) +Typically, there are typos in the torrc or wrong directory permissions (See the logging FAQ [FIXME add link] entry if you don't know how to enable or find your log file.) When Tor starts, it will automatically create the `HiddenServiceDir` that you specified (if necessary). Make sure this is the case. ## Step 4: Test that your onion service works Now to get your onion service address, go to your `HiddenServiceDir` directory, and find a file named `hostname`. -The `hostname` file in your hidden service configuration directory contains the hostname for your new Onion v3 hidden service. +The `hostname` file in your hidden service configuration directory contains the hostname for your new onion v3 hidden service. The other files are your hidden service keys, so it is imperative that these are kept private. -If your keys leak, other people can impersonate your hidden service, deeming it compromised, useless and dangerous to visit. +If your keys leak, other people can impersonate your onion service, deeming it compromised, useless, and dangerous to visit. -Now you can connect to your onion service using the Tor Browser and you should get the html page you setup back in step 1. +Now you can connect to your onion service using Tor Browser, and you should get the html page you setup back in step 1. If it doesn't work, look in your logs for some hints, and keep playing with it until it works. ## Step 5: More advanced tips

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2021