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

[community/staging] Distinguish between a docker image and container.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit d32c17df40f1bc0a22d2a452b381c19d30fa2491 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Nov 25 15:28:03 2019 -0800 Distinguish between a docker image and container. --- .../relay-operations/technical-setup/bridge/docker/contents.lr | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index ebc4b97..994453c 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -6,18 +6,18 @@ title: Docker --- body: -### 1. Install the container +### 1. Pull the image -We are maintaining a docker container that runs an obfs4 bridge. First, -download the container: +We are maintaining a docker image that runs an obfs4 bridge. First, +download the image: ``` docker pull phwinter/obfs4-bridge:latest ``` -### 2. Deploy the container +### 2. Deploy a container -We provide a Makefile that makes it easy to deploy the container. First, +We provide a Makefile that makes it easy to deploy a container. First, [download the Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs…, and then run:

1 0

[community/staging] one sentence per line, needed for localization
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 4ef2beae3f6cb2c48f7026082f770b5a016224ef Author: emma peel <emma.peel(a)riseup.net> Date: Mon Dec 2 19:14:10 2019 +0100 one sentence per line, needed for localization --- .../bridge/debian-ubuntu/contents.lr | 13 +++---- .../technical-setup/bridge/docker/contents.lr | 45 ++++++++-------------- 2 files changed, 22 insertions(+), 36 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr index 7f302c6..b6c57cd 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -25,17 +25,16 @@ If not, you can [build it from source](https://gitlab.com/yawning/obfs4#installa ``` BridgeRelay 1 -# Replace "TODO1" with a Tor port of your choice. This port must be externally -# reachable. Avoid port 9001 because it's commonly associated with Tor and -# censors may be scanning the Internet for this port. +# Replace "TODO1" with a Tor port of your choice. +# This port must be externally reachable. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ORPort TODO1 ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy -# Replace "TODO2" with an obfs4 port of your choice. This port must be -# externally reachable and must be different from the one specified for ORPort. -# Avoid port 9001 because it's commonly associated with -# Tor and censors may be scanning the Internet for this port. +# Replace "TODO2" with an obfs4 port of your choice. +# This port must be externally reachable and must be different from the one specified for ORPort. +# Avoid port 9001 because it's commonly associated with Tor and censors may be scanning the Internet for this port. ServerTransportListenAddr obfs4 0.0.0.0:TODO2 # Local communication port between Tor and obfs4. Always set this to "auto". diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 272afcf..4f88a69 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -8,8 +8,8 @@ body: ### 1. Pull the image -We are maintaining a docker image that runs an obfs4 bridge. First, -download the image: +We are maintaining a docker image that runs an obfs4 bridge. +First, download the image: ``` docker pull phwinter/obfs4-bridge:latest @@ -17,10 +17,9 @@ 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 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: ``` # Your bridge's Tor port. @@ -31,9 +30,7 @@ export PT_PORT=Y export 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: ``` @@ -47,12 +44,9 @@ You should now see output similar to the following: Make sure that port X and Y are forwarded in your firewall. ``` -That's it! Your container (identified by the first line of output) is now -bootstrapping your new obfs4 bridge. +That's it! Your container (identified by the first line of output) 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 @@ -62,8 +56,7 @@ 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: +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: ``` docker stop CONTAINER_ID @@ -72,13 +65,9 @@ docker pull phwinter/obfs4-bridge:latest source bridge.sh && make deploy ``` -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. 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. +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. +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 @@ -88,8 +77,8 @@ You can inspect your bridge's logs by running: docker logs CONTAINER_ID ``` -To use your new bridge in Tor Browser, you need its "bridge line". Here's how -you can get your bridge line: +To use your new bridge in Tor Browser, you need its "bridge line". +Here's how you can get your bridge line: ``` docker exec CONTAINER_ID get-bridge-line @@ -101,10 +90,8 @@ This will return a string similar to the following: obfs4 1.2.3.4:1234 B0E566C9031657EA7ED3FC9D248E8AC4F37635A4 cert=OYWq67L7MDApdJCctUAF7rX8LHvMxvIBPHOoAp0+YXzlQdsxhw6EapaMNwbbGICkpY8CPQ iat-mode=0 ``` -Make sure to check out the [post-install -notes](https://community.torproject.org/relay/setup/bridge/post-install/). If -you are having troubles setting up your bridge, have a look at [our help -section](https://community.torproject.org/relay/getting-help/). +Make sure to check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/). +If you are having troubles setting up your bridge, have a look at [our help section](https://community.torproject.org/relay/getting-help/). --- html: two-columns-page.html

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit e06f1c271990c77a73b46392e1afe96e9a57ccfa Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 16:11:42 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index c722b34..f0ea955 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit c722b346e16884df3bedc93cffba8887cfcb65e1 +Subproject commit f0ea955c50f147813fd7735d226e7f4689e94523

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 9335473b5e7acf44905653cd2d7dabc100a1b1c1 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:03:36 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 3409e3e..7c0e9ee 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc +Subproject commit 7c0e9ee42a4cdef87ebb8eefa7dde2df89403c94

1 0

[community/staging] Update lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 675ef6fb9e6b0db01f58879a04ec2e8c28a1e6c5 Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:55:32 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index d892ab1..ab20d49 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit d892ab188dbc30f5827c93fc851506e383b48715 +Subproject commit ab20d4988902e4dd228e15c9fbd51d7041ba8323

1 0

[community/staging] Make color header consistent
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 276e27d951de5175315a62aa863a1f992dfbcc02 Author: Antonela <hola(a)antonela.me> Date: Thu Dec 5 08:54:43 2019 -0300 Make color header consistent Fix https://dip.torproject.org/torproject/web/community/issues/108 --- .../community-resources/bad-relays/contents.lr | 26 ++++++++++++---------- .../eff-tor-legal-faq/contents.lr | 4 +++- .../tor-dmca-response/contents.lr | 2 ++ .../community-resources/good-bad-isps/contents.lr | 2 ++ .../community-resources/swag/contents.lr | 6 +++-- .../tor-abuse-templates/contents.lr | 2 ++ .../tor-exit-guidelines/contents.lr | 4 +++- .../tor-relay-universities/contents.lr | 4 +++- 8 files changed, 33 insertions(+), 17 deletions(-) diff --git a/content/relay-operations/community-resources/bad-relays/contents.lr b/content/relay-operations/community-resources/bad-relays/contents.lr index 217730a..594eaf6 100644 --- a/content/relay-operations/community-resources/bad-relays/contents.lr +++ b/content/relay-operations/community-resources/bad-relays/contents.lr @@ -1,10 +1,12 @@ _model: page --- +color: primary +--- title: Bad relays --- body: -Ran into a misconfigured, malicious, or suspicious relay while using Tor? Please let us know by sending email to bad-relays AT lists DOT torproject DOT org! Many bad relays are caught thanks to our wider community, so many thanks for all your help and vigilance! +Ran into a misconfigured, malicious, or suspicious relay while using Tor? Please let us know by sending email to bad-relays AT lists DOT torproject DOT org! Many bad relays are caught thanks to our wider community, so many thanks for all your help and vigilance! ### What is a bad relay? @@ -12,16 +14,16 @@ A bad relay is one that either doesn't work properly or tampers with our users' * Tampering with exit traffic in any way (including dropping accepted connections). This might be accidental (such as an anti-virus filter) or malicious (commonly SSLStrip, which replaces https:// links with http:// to snoop on traffic) or even intentional (such as layer 7 inspection for P2P traffic detection/mitigation). * Running HSDirs that harvest and probe .onion addresses - * Manipulating the DHT that is used for onion services, e.g., by positioning itself in the DHT. + * Manipulating the DHT that is used for onion services, e.g., by positioning itself in the DHT. * Using a DNS provider that censors its results (such as some [OpenDNS](http://www.opendns.com) or Quad (9 9.9.9.9) configurations). * Performing a [Sybil attack](https://en.wikipedia.org/wiki/Sybil_attack), which means flooding the network with new relays in an effort to deanonymize users. If you want to run multiple relays then that's great! But please be sure to set the [MyFamily parameter](https://www.torproject.org/docs/tor-manual.html.en#MyFamily). - * Exit relays routing their exit traffic back into the tor network (not actually exiting any traffic) - + * Exit relays routing their exit traffic back into the tor network (not actually exiting any traffic) + Also, if your relay is stolen or goes missing, please report it as well, so we can blacklist it in case whoever took it puts it back online. -The following are currently permitted yet do have some discussion for prohibition (as such, they should not be reported at this time)... +The following are currently permitted yet do have some discussion for prohibition (as such, they should not be reported at this time)... - * Only allowing plain-text traffic (for instance, just port 80). There's no good reason to disallow its encrypted counterpart (like port 443), making these relays highly suspect for sniffing traffic. See [context](https://www.google.com/search?site:torproject.org+80+443+6667) and [spec](https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1969). + * Only allowing plain-text traffic (for instance, just port 80). There's no good reason to disallow its encrypted counterpart (like port 443), making these relays highly suspect for sniffing traffic. See [context](https://www.google.com/search?site:torproject.org+80+443+6667) and [spec](https://gitweb.torproject.org/torspec.git/tree/dir-spec.txt#n1969). ### How do I report a bad relay? @@ -31,9 +33,9 @@ You can check which exit you are using at any time by visiting [tor check](https 1. The relay's IP address or fingerprint. The fingerprint is a forty-character hex string such as `203933ED4E55EF8A3C3518427D1A1ED6A4CC285E`. 2. What kind of behavior did you see? - 3. Any additional information we'll need to reproduce the issue. + 3. Any additional information we'll need to reproduce the issue. -However, if you need help with anything Tor-related, please contact the [help desk](https://www.torproject.org/about/contact) instead. +However, if you need help with anything Tor-related, please contact the [help desk](https://www.torproject.org/about/contact) instead. ### What happens to bad relays? @@ -43,19 +45,19 @@ We have thee types of flags we can apply: * BadExit - Never used as an exit relay (for relays that appear to mess with exit traffic) * Invalid - Never used unless AllowInvalidNodes is set (by default this only allows for middle and rendezvous usage) - * Reject - Dropped from the consensus entirely + * Reject - Dropped from the consensus entirely -Which we use depends on the severity of the issue, and if it can still be safely used in certain situations. +Which we use depends on the severity of the issue, and if it can still be safely used in certain situations. ### My relays was given the BadExit flag. What's up? -In just about all cases we're unable to contact the operator to resolve the issue, so if your relay has been flagged as a BadExit then please let us know (see above for contact info) so we can work together to fix the issue. +In just about all cases we're unable to contact the operator to resolve the issue, so if your relay has been flagged as a BadExit then please let us know (see above for contact info) so we can work together to fix the issue. ### Do you actively look for bad relays? Yes. For our automated issue detection see [exitmap](http://www.cs.kau.se/philwint/spoiled_onions/) and [sybilhunter](https://gitweb.torproject.org/user/phw/sybilhunter.git/). -Other monitors include [tortunnel](http://www.thoughtcrime.org/software/tortunnel/), [SoaT](https://gitweb.torproject.org/torflow.git/blob/HEAD:/NetworkScanners/…, [torscanner](https://code.google.com/p/torscanner/), and [DetecTor](http://detector.io/DetecTor.html). +Other monitors include [tortunnel](http://www.thoughtcrime.org/software/tortunnel/), [SoaT](https://gitweb.torproject.org/torflow.git/blob/HEAD:/NetworkScanners/…, [torscanner](https://code.google.com/p/torscanner/), and [DetecTor](http://detector.io/DetecTor.html). --- diff --git a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr b/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr index 0875d86..acc857c 100644 --- a/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr +++ b/content/relay-operations/community-resources/eff-tor-legal-faq/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: The Legal FAQ for Tor Relay Operators --- body: @@ -62,7 +64,7 @@ Of course, you should avoid keeping any sensitive or personal information on the The Tor Project [suggests](https://blog.torproject.org/blog/tips-running-exit-node) the following ways to let others know that you're running an exit relay: - * Set up a reverse DNS name for the IP address that makes clear that the computer is an exit relay. + * Set up a reverse DNS name for the IP address that makes clear that the computer is an exit relay. * Set up a notice like [this](https://blog.torproject.org/blog/tips-running-exit-node) to explain that you're running an exit relay that's part of the Tor network. * If possible, get an [ARIN](https://www.arin.net/) registration for your exit relay that displays contact information for you, not your ISP. This way, you'll receive any abuse complaints and can respond to them directly. Otherwise, try to ensure that your ISP forwards abuse complaints that it receives to you. diff --git a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr b/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr index e844d39..1bbccb8 100644 --- a/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr +++ b/content/relay-operations/community-resources/eff-tor-legal-faq/tor-dmca-response/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Response template for Tor relay operator to ISP --- body: diff --git a/content/relay-operations/community-resources/good-bad-isps/contents.lr b/content/relay-operations/community-resources/good-bad-isps/contents.lr index 4100d18..4dab46e 100644 --- a/content/relay-operations/community-resources/good-bad-isps/contents.lr +++ b/content/relay-operations/community-resources/good-bad-isps/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Good Bad ISPs --- body: diff --git a/content/relay-operations/community-resources/swag/contents.lr b/content/relay-operations/community-resources/swag/contents.lr index b1c1419..53fa7bb 100644 --- a/content/relay-operations/community-resources/swag/contents.lr +++ b/content/relay-operations/community-resources/swag/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Swag --- body: @@ -7,12 +9,12 @@ body: You can get one of these fine Tor T-shirts for contributing to the Tor project. There are two primary ways of contributing: * Operate a fast Tor relay that's been running for the past two months: you are eligible if you allow exits to port 80 and you average 250 KBytes/s traffic, or if you're not an exit but you average 500 KBytes/s traffic. - + * Help out in other ways. Maintain a translation. Run Tor trainings. Write a good support program and get a lot of people to use it. Do research on Tor and anonymity, solve some of our bugs, or establish yourself as a Tor advocate. If you're operating a fast relay or you've done something else cool, email us at tshirt at torproject.org with the details. (We want to make sure our shirts help outreach happen all around the world, so please understand if we can't send you 5 shirts for your 5 excellent relays.) -There are a variety of colors, shapes, and sizes available in the great roots design that Leiah Jansen made for us, as well as some older designs. +There are a variety of colors, shapes, and sizes available in the great roots design that Leiah Jansen made for us, as well as some older designs. --- html: two-columns-page.html --- diff --git a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr index 0e37f24..e3b67a3 100644 --- a/content/relay-operations/community-resources/tor-abuse-templates/contents.lr +++ b/content/relay-operations/community-resources/tor-abuse-templates/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Tor Abuse Templates --- body: diff --git a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr index 7529051..8734580 100644 --- a/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr +++ b/content/relay-operations/community-resources/tor-exit-guidelines/contents.lr @@ -1,10 +1,12 @@ _model: page --- +color: primary +--- title: Tor Exit Guidelines --- body: -These guidelines are meant to give you a quick introduction into the business of running your own exit relay. +These guidelines are meant to give you a quick introduction into the business of running your own exit relay. NOTE: This FAQ is for informational purposes only and does not constitute legal advice. diff --git a/content/relay-operations/community-resources/tor-relay-universities/contents.lr b/content/relay-operations/community-resources/tor-relay-universities/contents.lr index a3640bd..0b88a90 100644 --- a/content/relay-operations/community-resources/tor-relay-universities/contents.lr +++ b/content/relay-operations/community-resources/tor-relay-universities/contents.lr @@ -1,5 +1,7 @@ _model: page --- +color: primary +--- title: Tor Relay Universities --- body: @@ -82,7 +84,7 @@ Note that in many cases you don't even need to be researching the exit node itse Subscribe to [Tor Relays Universities](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-rel… mailing list (and other education institutions too). --- -cta: +cta: --- html: two-columns-page.html ---

1 0

[community/staging] change link
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 6fd081a6850881bb99762b582c4625a1df493d04 Author: dgaleanoservian-guest <dgaleanoservian(a)gmail.com> Date: Tue Oct 8 21:28:05 2019 +0200 change link --- content/localization/translation-problem/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/localization/translation-problem/contents.lr b/content/localization/translation-problem/contents.lr index 56eb26d..242c109 100644 --- a/content/localization/translation-problem/contents.lr +++ b/content/localization/translation-problem/contents.lr @@ -18,7 +18,7 @@ body: ### Reporting an error with a translation -* If you are already a [Tor translator](becoming-tor-translator), you can simply find the string and fix it in [transifex](https://www.transifex.com/otf/torproject/). +* If you are already a [Tor translator](../becoming-tor-translator), you can simply find the string and fix it in [transifex](https://www.transifex.com/otf/torproject/). * If you don't know how to find the string to fix, you can [open a ticket on our Bugtracker](https://support.torproject.org/misc/bug-or-feedback/), under the **Community/Translations** component. * You can report such issues on [irc](https://webchat.oftc.net/), on the #tor-l10n channel (you may need to be registered to log in). * You can send an email to the [tor localization mailing list](https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n).

1 0

[community/staging] Merge remote-tracking branch 'egypcio/torbsd-bridges'
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 27a800fa107b40e1c6d76fedd8028a6396863f83 Merge: d15ab1b 8187d99 Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Oct 28 14:06:50 2019 -0700 Merge remote-tracking branch 'egypcio/torbsd-bridges' .../bridge/dragonflybsd/contents.lr | 145 +++++++++++++++++++++ .../technical-setup/bridge/netbsd/contents.lr | 100 ++++++++++++++ 2 files changed, 245 insertions(+)

1 0

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

21 Mar '21

commit 548d63c3f3ce1b05ccedeed12359834993271f97 Author: hiro <hiro(a)torproject.org> Date: Thu Oct 31 13:50:21 2019 +0100 update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 08f767b..8a4ddc7 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 08f767bc33c462c2bc3ae8dd05039c6c3c6d7f39 +Subproject commit 8a4ddc76122db1b60a2ed2b0217c49b7ad77f3d5

1 0

[community/staging] Improve docker setup instructions.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit bfe821bc6466793d8cffdec579b43df219dd28e5 Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Oct 30 12:35:29 2019 -0700 Improve docker setup instructions. This partially fixes: <https://bugs.torproject.org/31834> --- .../technical-setup/bridge/docker/contents.lr | 50 +++++++++++++++++++--- 1 file changed, 44 insertions(+), 6 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index f82a65e..f401b1e 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -6,17 +6,55 @@ title: Docker --- body: -We are maintaining a docker container that allows you to quickly set up an obfs4 bridge. First, fetch the container: +We are maintaining a docker container that runs an obfs4 bridge. This guide +walks you through setting up this container. First, download the container: -`docker pull phwinter/obfs4-bridge:latest` +``` +docker pull phwinter/obfs4-bridge:latest +``` -Now, it's time to run the container. We maintain a script that automatically determines a free OR and obfs4 port for you. The script only requires your email address as argument: +Now, it's time to run the container. You can choose between two options: + +1. We maintain a script that determines a free OR and obfs4 port for you, and + then runs the docker container. + [Download the script here](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-br…. + When running this script, provide your email address as argument: + ``` + bash deploy-container.sh address(a)email.com ``` - $ curl https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/r… > deploy-container.sh - $ bash deploy-container.sh address(a)email.com + The script will tell you what ports it chose, and your container ID. Make + sure that **both** ports are forwarded in your firewall. + +2. If you would rather provide your own ports, run the following command and + replace `XXX` with your OR port, `YYY` with your obfs4 port, and + `admin(a)example.com` with your email address. + ``` + OR_PORT=XXX PT_PORT=YYY EMAIL=admin(a)example.com; docker run -d -e OR_PORT=$OR_PORT -e PT_PORT=$PT_PORT -e EMAIL=$EMAIL -p $OR_PORT:$OR_PORT -p $PT_PORT:$PT_PORT phwinter/obfs4-bridge:latest + ``` + + Again, make sure that **both** ports are forwarded by your firewall. + +That's it! Your container should now be bootstrapping your new obfs4 bridge. +You can inspect its logs by running: + +``` +docker logs CONTAINER_ID +``` + +To use your new bridge in Tor Browser, you need its "bridge line". Here's how +you can get your bridge line: + +``` +docker exec CONTAINER_ID get-bridge-line +``` + +This will return a string similar to the following: + +``` +obfs4 1.2.3.4:1234 B0E566C9031657EA7ED3FC9D248E8AC4F37635A4 cert=OYWq67L7MDApdJCctUAF7rX8LHvMxvIBPHOoAp0+YXzlQdsxhw6EapaMNwbbGICkpY8CPQ iat-mode=0 +``` -That's it! Your container should now be bootstrapping your new obfs4 Tor bridge. Make sure to check out the [post-install notes](https://community.torproject.org/relay/setup/bridge/post-install/). If you are having troubles setting up your bridge, have a look at [our help

1 0