March 2021 - tor-commits - lists.torproject.org

[community/staging] Merge branch 'outreach-talking-points-meetup'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 5ea94a4ff64c8c42a4cb173de379c8b840f0c9c5 Merge: dd27ae8 cc4b06f Author: gus <gus(a)torproject.org> Date: Wed May 13 10:02:54 2020 -0400 Merge branch 'outreach-talking-points-meetup' content/outreach/meetup/contents.lr | 49 +++++++++++++++++++++++++++++++++++++ content/outreach/talk/contents.lr | 28 +++++++++++++++++++-- 2 files changed, 75 insertions(+), 2 deletions(-)

1 0

[community/staging] Add Tor talking points
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit cd48478f8056bda06bb6abf6b0aa66b0888bb361 Author: gus <gus(a)torproject.org> Date: Fri May 8 12:02:45 2020 -0400 Add Tor talking points --- content/outreach/talk/contents.lr | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/content/outreach/talk/contents.lr b/content/outreach/talk/contents.lr index 234fdb0..496a54e 100644 --- a/content/outreach/talk/contents.lr +++ b/content/outreach/talk/contents.lr @@ -16,6 +16,30 @@ html: two-columns-page.html --- body: -## Talk about Tor +Word of mouth is critical to reaching new people and helping them protect themselves online. Here's how you can help. -Here you'll find materials on basic Tor explainers and concepts, ideas for preparing a Tor talk, suggested social media posts, and more. +## Explain how + +### Privacy and freedom are human rights. + +These rights are denied online around the world, but Tor gives them back. + +### Tracking and surveillance are widespread. + +We think privacy should be the default online, and that's what our software provides. + +### Privacy isn't about having something to hide. + +Privacy is about protecting who we are as human beings: our fears, our relationships, and our vulnerabilities. + +### People shouldn't be exploited for using the internet. + +Trackers are harvesting our every move, but a safer internet is possible. + +### Tor software is developed by the Tor Project, a 501(c)3 nonprofit organization. + +We build free and open source software anyone can use. + +### Tor software is used by millions of people around the world. + +Journalists, activists, and everyday internet users rely on Tor.

1 0

[community/staging] Updates sub-header to Community
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit b76431eb1d9de6053c634dbd21166e8c421fcadf Author: Antonela <hola(a)antonela.me> Date: Thu May 14 15:22:49 2020 -0300 Updates sub-header to Community --- content/localization/contents.lr | 2 +- content/onion-services/contents.lr | 2 +- content/outreach/contents.lr | 2 +- content/relay-operations/contents.lr | 2 +- content/training/contents.lr | 2 +- content/user-research/contents.lr | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/content/localization/contents.lr b/content/localization/contents.lr index 00b6229..a1d81c7 100644 --- a/content/localization/contents.lr +++ b/content/localization/contents.lr @@ -1,4 +1,4 @@ -section: localization +section: Community --- section_id: localization --- diff --git a/content/onion-services/contents.lr b/content/onion-services/contents.lr index d9af6b7..a9b8ea4 100644 --- a/content/onion-services/contents.lr +++ b/content/onion-services/contents.lr @@ -1,4 +1,4 @@ -section: onion services +section: Community --- section_id: onion-services --- diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr index 8e7206a..cd2b5fe 100644 --- a/content/outreach/contents.lr +++ b/content/outreach/contents.lr @@ -1,4 +1,4 @@ -section: outreach +section: Community --- section_id: outreach --- diff --git a/content/relay-operations/contents.lr b/content/relay-operations/contents.lr index 6cc4932..1d13163 100644 --- a/content/relay-operations/contents.lr +++ b/content/relay-operations/contents.lr @@ -1,4 +1,4 @@ -section: relay operations +section: Community --- section_id: relay-operations --- diff --git a/content/training/contents.lr b/content/training/contents.lr index 2d7693c..0a87ede 100644 --- a/content/training/contents.lr +++ b/content/training/contents.lr @@ -1,4 +1,4 @@ -section: training +section: Community --- section_id: training --- diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 444df2a..e3ee4ae 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -1,4 +1,4 @@ -section: community +section: Community --- section_id: user-research ---

1 0

[community/staging] Add training slides all about tor in ES
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 579142bf5cec978c83338b3a150479f1737b851a Author: gus <gus(a)torproject.org> Date: Wed May 13 16:20:18 2020 -0400 Add training slides all about tor in ES --- databags/training-resources.json | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/databags/training-resources.json b/databags/training-resources.json index b1fecd7..07591d0 100644 --- a/databags/training-resources.json +++ b/databags/training-resources.json @@ -7,5 +7,15 @@ "formats" : ["odp","md"], "description" : "Full set of slides for Tor Trainings", "date" : "2019" + }, + + "todo sobre tor" : + { + "label" : "Todo sobre Tor", + "name" : "all-about-tor", + "filename" : "all-about-tor-full-pack+es", + "formats" : ["odp"], + "description" : "Un conjunto completo de diapositivas para los entrenamientos de Tor", + "date" : "2019" } -} \ No newline at end of file +}

1 0

[community/staging] Update docs to reflect switch to docker-compose.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit dd27ae88c83585f062c0975b978a59ba16fbae8b Author: Philipp Winter <phw(a)nymity.ch> Date: Tue May 12 12:39:30 2020 -0700 Update docs to reflect switch to docker-compose. --- .../technical-setup/bridge/docker/contents.lr | 40 +++++++++++++--------- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 4f88a69..48208ca 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -17,36 +17,45 @@ docker pull phwinter/obfs4-bridge:latest ### 2. Deploy a container -We provide a Makefile that helps you deploy the container. -First, [download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs…, and then write your bridge configuration to a new file, bridge.sh. -Here's a template: +We provide a docker-compose.yml file that helps you deploy the container. +First, +[download docker-compose.yml](https://dip.torproject.org/torproject/anti-censorship/d…, +and then write your bridge configuration to a new file, `.env`, which is in the +same directory as `docker-compose.yml`. Here's a +template: ``` # Your bridge's Tor port. -export OR_PORT=X +OR_PORT=X # Your bridge's obfs4 port. -export PT_PORT=Y +PT_PORT=Y # Your email address. -export EMAIL=Z +EMAIL=Z ``` -Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that **both** ports are forwarded in your firewall), and `Z` with your email address, which allows us to get in touch with you if there are problems with your bridge. +Replace `X` with your desired OR port, `Y` with your obfs4 port (make sure that +**both** ports are forwarded in your firewall), and `Z` with your email address, +which allows us to get in touch with you if there are problems with your bridge. With your bridge configuration in place, you can now deploy the container: ``` -source bridge.sh && make deploy +docker-compose up -d obfs4-bridge ``` +This command will automatically load your `docker-compose.yml` file while +considering the environment variables in `.env`. + You should now see output similar to the following: ``` -201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108 -Make sure that port X and Y are forwarded in your firewall. +Starting docker-obfs4-bridge_obfs4-bridge_1 ... done ``` -That's it! Your container (identified by the first line of output) is now bootstrapping your new obfs4 bridge. +That's it! Your container is now bootstrapping your new obfs4 bridge. -If you want to run multiple bridges on your machine, you need to create more bridge configuration files with different sets of ports, and run `make deploy` again, like so: +If you want to run multiple bridges on your machine, you need to create more +bridge configuration files with different sets of ports, and run `make deploy` +again, like so: ``` source bridge-1.sh && make deploy @@ -56,13 +65,10 @@ source bridge-2.sh && make deploy ### 3. Upgrade your container -To upgrade to the latest version of our image, you need to stop your existing container, delete it, pull the latest image, and finally deploy it again: +Upgrading to the latest version of our image is as simple as running: ``` -docker stop CONTAINER_ID -docker rm CONTAINER_ID -docker pull phwinter/obfs4-bridge:latest -source bridge.sh && make deploy +docker-compose up -d obfs4-bridge ``` Note that your bridge's data directory (which includes its key material) is stored in a docker volume, so you won't lose your bridge's identity when upgrading to the latest docker image.

1 0

[community/staging] Find and fix header with two colors
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 5b80cf8e01c8ac61a0fc24bc423e36af3d1d85f2 Author: Nicolei Ocana <nicoleiocana(a)gmail.com> Date: Thu May 7 13:26:51 2020 +0000 Find and fix header with two colors --- .../technical-setup/bridge/centos-rhel-opensuse/contents.lr | 2 -- content/relay-operations/technical-setup/bridge/fedora/contents.lr | 2 -- content/relay-operations/technical-setup/bridge/openbsd/contents.lr | 2 ++ content/relay-operations/technical-setup/exit/contents.lr | 2 ++ content/user-research/become-tester/contents.lr | 2 ++ 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr index c19f029..caaab92 100644 --- a/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr +++ b/content/relay-operations/technical-setup/bridge/centos-rhel-opensuse/contents.lr @@ -137,8 +137,6 @@ key: 2 --- -color: primary ---- subtitle: How to deploy an obfs4 bridge on CentOS / RHEL / OpenSUSE --- _template: layout.html diff --git a/content/relay-operations/technical-setup/bridge/fedora/contents.lr b/content/relay-operations/technical-setup/bridge/fedora/contents.lr index 51c97fc..7caf4aa 100644 --- a/content/relay-operations/technical-setup/bridge/fedora/contents.lr +++ b/content/relay-operations/technical-setup/bridge/fedora/contents.lr @@ -109,8 +109,6 @@ key: 2 --- -color: primary ---- subtitle: How to deploy an obfs4 bridge on Fedora --- _template: layout.html diff --git a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr index 7bb27e3..5495f79 100644 --- a/content/relay-operations/technical-setup/bridge/openbsd/contents.lr +++ b/content/relay-operations/technical-setup/bridge/openbsd/contents.lr @@ -2,6 +2,8 @@ _model: page --- title: OpenBSD --- +color: primary +--- html: two-columns-page.html --- key: 4 diff --git a/content/relay-operations/technical-setup/exit/contents.lr b/content/relay-operations/technical-setup/exit/contents.lr index 43d6f39..cbb9327 100644 --- a/content/relay-operations/technical-setup/exit/contents.lr +++ b/content/relay-operations/technical-setup/exit/contents.lr @@ -2,6 +2,8 @@ _model: page --- title: Exit --- +color: primary +--- html: two-columns-page.html --- section: relay operations diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index de0ef97..ef005eb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -4,6 +4,8 @@ section_id: user-research --- title: Become a Tester --- +color: primary +--- subtitle: We regularly release Tor Browser early versions to allow users to test software improvements and new ideas. Sign up to be in our testing pool. --- key: 1

1 0

[community/staging] Add Zwiebelfreunde website
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 59821b4bcf7f2a0681b92ae35efae4de2e358c3b Author: gus <gus(a)torproject.org> Date: Wed May 13 11:15:13 2020 -0400 Add Zwiebelfreunde website --- databags/relay-associations.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini index 9618005..01f0b71 100644 --- a/databags/relay-associations.ini +++ b/databags/relay-associations.ini @@ -1,5 +1,5 @@ [zwiebelfreunde] -link = +link = https://www.zwiebelfreunde.de/ image = label = Zwiebelfreunde e.V. country = Germany

1 0

[community/staging] Merge branch 'training-slides'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit c218e2d812f7bbde172c84aeb29dffcdedaf55ae Merge: 3f4665b 4000c9b Author: gus <gus(a)torproject.org> Date: Wed May 13 18:23:42 2020 -0400 Merge branch 'training-slides' databags/training-resources.json | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)

1 0

[community/staging] Add how to organise a meetup
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit cc4b06f9a93dfd6d53ad7f64b6f8cbac911e17a0 Author: gus <gus(a)torproject.org> Date: Fri May 8 12:03:26 2020 -0400 Add how to organise a meetup --- content/outreach/meetup/contents.lr | 49 +++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/content/outreach/meetup/contents.lr b/content/outreach/meetup/contents.lr new file mode 100644 index 0000000..ce4cfca --- /dev/null +++ b/content/outreach/meetup/contents.lr @@ -0,0 +1,49 @@ +section: outreach +--- +section_id: outreach +--- +color: primary +--- +_template: layout.html +--- +title: Organize a Tor meetup +--- +subtitle: Learn how to organize a Tor meetup with your friends. +--- +key: 4 +--- +html: two-columns-page.html +--- +body: + +Organized by the community, meetups are a great way to find and strengthen the privacy supporters community in your local area. + +### Step 1 + +Connect with a local space that will allow you to meet for an hour or two. +A public library, a social center, a hackerspace or a room in a university are some spaces that you can usually host your event. + +### Step 2 + +Choose a date and time that is convenient for your group and the local space. +On weekends or during week days, after working hours (7 pm) might be better. +After confirming a local and date, create a poster and an online invitation to spread the event. + +### Step 3 + +Find a meetup facilitator and draft an agenda, for example, question & answer about Tor, how to setup relays. +Read and follow our [best practices](https://community.torproject.org/training/best-practices/). + +### Step 4 + +Before the meetup, organize the space. Buy some chips and snacks, hang some [posters](https://community.torproject.org/outreach/kit/) nearby the local, so people can find easily. +If you have some printed materials and/or Tor swag, put it on a table. + +### Step 5 + +Load your presentation and wait a few minutes to people arrive. +During the activity take notes about questions, how many knew about Tor before, how many are relay operators, etc + +### Step 6 + +After the meetup, clean up the space, remove the posters and upload your notes to [Tor Community Team](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-community-t… mailing list.

1 0

[community/staging] Add Artikel5 in relay association page
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 28e3f601c0dd8e34e0ba7d268d6c7ec4bb43e38c Author: gus <gus(a)torproject.org> Date: Wed May 13 11:12:12 2020 -0400 Add Artikel5 in relay association page --- databags/relay-associations.ini | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini index cb7f197..9618005 100644 --- a/databags/relay-associations.ini +++ b/databags/relay-associations.ini @@ -146,4 +146,14 @@ country = UK contact = hello(a)brasshorncommunications.uk active = True display = +donate = + +[artikel5ev] +link = https://www.artikel5ev.de/aktuelles/ +image = +label = Artikel 5 e.V. +country = Germany +contact = https://www.artikel5ev.de/kontakt/ +active = True +display = donate =

1 0