May 2020 - tor-commits - lists.torproject.org

[community/master] Add Zwiebelfreunde website
by gus＠torproject.org 13 May '20

13 May '20

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/master] Add Artikel5 in relay association page
by gus＠torproject.org 13 May '20

13 May '20

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

[community/master] Include a short description about relay associations
by gus＠torproject.org 13 May '20

13 May '20

commit 3d3c0a0341f61151d9ab809a65a5d67e241e54ab Author: gus <gus(a)torproject.org> Date: Wed May 13 11:23:23 2020 -0400 Include a short description about relay associations --- .../community-resources/relay-associations/contents.lr | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/content/relay-operations/community-resources/relay-associations/contents.lr b/content/relay-operations/community-resources/relay-associations/contents.lr index 28cc246..bbd0f77 100644 --- a/content/relay-operations/community-resources/relay-associations/contents.lr +++ b/content/relay-operations/community-resources/relay-associations/contents.lr @@ -12,8 +12,11 @@ section: Community Resources --- section_id: community-resources --- -subtitle: Here is a list of currently active relay associations. +subtitle: Relay associations are independent organizations that runs relays in the Tor network. --- body: -Please let us know if you would like your relay association to be listed on this page. \ No newline at end of file +There are several organizations around the world that run Tor relays. +Some organizations are dedicated to this purpose only and they are called Relay Associations. +Below, you can find a list of organizations that run relays. +Please let us know if you would like your organization to be listed on this page.

1 0

[community/master] Display Noisetor in relay association page
by gus＠torproject.org 13 May '20

13 May '20

commit 23f815697672aef873c7c3355d99563e22f53b39 Author: gus <gus(a)torproject.org> Date: Wed May 13 11:08:31 2020 -0400 Display Noisetor in relay association page --- databags/relay-associations.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/relay-associations.ini b/databags/relay-associations.ini index 3979727..cb7f197 100644 --- a/databags/relay-associations.ini +++ b/databags/relay-associations.ini @@ -94,7 +94,7 @@ image = label = NoiseTor country = US contact = -active = +active = True display = donate = @@ -146,4 +146,4 @@ country = UK contact = hello(a)brasshorncommunications.uk active = True display = -donate = \ No newline at end of file +donate =

1 0

[community/master] Merge branch 'training-slides'
by gus＠torproject.org 13 May '20

13 May '20

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/master] Add new training material about the tor network
by gus＠torproject.org 13 May '20

13 May '20

commit 4000c9bbaf65a9b24b2f104684cb04ac4fabc5f0 Author: gus <gus(a)torproject.org> Date: Wed May 13 17:05:52 2020 -0400 Add new training material about the tor network --- databags/training-resources.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/databags/training-resources.json b/databags/training-resources.json index 07591d0..f1e8b10 100644 --- a/databags/training-resources.json +++ b/databags/training-resources.json @@ -17,5 +17,15 @@ "formats" : ["odp"], "description" : "Un conjunto completo de diapositivas para los entrenamientos de Tor", "date" : "2019" + }, + + "tor network" : + { + "label" : "The Tor network", + "name" : "tor-network", + "filename" : "tor-network", + "formats" : ["odp","pdf"], + "description" : "Learn about the Tor network and how to run a relay", + "date" : "2019" } }

1 0

[community/master] Add training slides all about tor in ES
by gus＠torproject.org 13 May '20

13 May '20

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

[onionperf/master] Print out help if no argument is given.
by karsten＠torproject.org 13 May '20

13 May '20

commit 52d9c2f02751530cd7767b99acd419654156b5a7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 13 21:25:08 2020 +0200 Print out help if no argument is given. This has changed since moving from Python 2 to 3. Patch by acute. Fixes #34208. --- onionperf/onionperf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index cb1899c..a61fd73 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -347,8 +347,12 @@ files generated by this script will be written""", default=util.LINEFORMATS) # get args and call the command handler for the chosen mode - args = main_parser.parse_args() - args.func(args) + if len(sys.argv) == 1: + main_parser.print_help() + sys.exit(1) + else: + args = main_parser.parse_args() + args.func(args) def monitor(args): from onionperf.monitor import TorMonitor

1 0

[training/master] Rename slides pack in spanish
by gus＠torproject.org 13 May '20

13 May '20

commit b6d0092c292990406ff8a98815c683d2f1137b33 Author: gus <gus(a)torproject.org> Date: Wed May 13 15:04:46 2020 -0400 Rename slides pack in spanish --- ...ides-full-deck+es.odp => all-about-tor-full-pack+es.odp} | Bin 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/2019/all-about-tor/tor-slides-full-deck+es.odp b/2019/all-about-tor/all-about-tor-full-pack+es.odp similarity index 100% rename from 2019/all-about-tor/tor-slides-full-deck+es.odp rename to 2019/all-about-tor/all-about-tor-full-pack+es.odp

1 0

[community/master] Remove outdated and redundant paragraphs.
by phw＠torproject.org 13 May '20

13 May '20

commit 3f4665b232c82d718fdee019fbb651d0fc8dff50 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed May 13 08:51:46 2020 -0700 Remove outdated and redundant paragraphs. --- .../technical-setup/bridge/docker/contents.lr | 30 +++++----------------- 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 48208ca..7c964f8 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -6,18 +6,9 @@ title: Docker --- body: -### 1. Pull the image +### 1. Deploy a container -We are maintaining a docker image that runs an obfs4 bridge. -First, download the image: - -``` -docker pull phwinter/obfs4-bridge:latest -``` - -### 2. Deploy a container - -We provide a docker-compose.yml file that helps you deploy the container. +We provide a docker-compose 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 @@ -36,7 +27,8 @@ 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. -With your bridge configuration in place, you can now deploy the container: +With your bridge configuration in place, you can now deploy the container by +running: ``` docker-compose up -d obfs4-bridge @@ -53,17 +45,7 @@ Starting docker-obfs4-bridge_obfs4-bridge_1 ... done 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: - -``` -source bridge-1.sh && make deploy -source bridge-2.sh && make deploy -... -``` - -### 3. Upgrade your container +### 2. Upgrade your container Upgrading to the latest version of our image is as simple as running: @@ -75,7 +57,7 @@ Note that your bridge's data directory (which includes its key material) is stor If you are running multiple bridges on your computer, you need to repeat this step for each bridge. We will announce new image versions on the [tor-dev](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-dev) mailing list. -### 4. Monitor your logs +### 3. Monitor your logs You can inspect your bridge's logs by running:

1 0