tor-commits March 2021

tor-commits@lists.torproject.org

17 participants
2169 discussions

[community/staging] better strings for l10n. please add one sentence per line.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit d8e9c59d9311e93045db94c491a8615523a33bf8 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Oct 31 15:41:39 2019 +0100 better strings for l10n. please add one sentence per line. --- content/user-research/contents.lr | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 2ad1aeb..31b93ef 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -20,4 +20,7 @@ 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. +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] Restore lego
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 9ef6d1404feba7ebc0018812a701ebd39302c14d Author: hiro <hiro(a)torproject.org> Date: Tue Nov 12 11:34:33 2019 +0100 Restore lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 09c5813..6a550fa 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit 6a550faea39a534af47923a01bd29d138365819f

1 0

[community/staging] Remove unused menu and update template
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit a5f03cebf373c48b3dd7516baeeeebce036adf31 Author: hiro <hiro(a)torproject.org> Date: Mon Nov 11 17:09:11 2019 +0100 Remove unused menu and update template --- databags/menu+bn-BD.ini | 1 - databags/menu+de.ini | 1 - databags/menu+en.ini | 1 - databags/menu+es.ini | 1 - databags/menu+fr.ini | 1 - databags/menu+id.ini | 1 - databags/menu+is.ini | 1 - databags/menu+it.ini | 1 - databags/menu+ka.ini | 1 - databags/menu+ko.ini | 1 - databags/menu+pt-BR.ini | 1 - databags/menu+ru.ini | 1 - databags/menu+tr.ini | 1 - databags/menu+zh-CN.ini | 1 - databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 1 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+id.ini | 1 - databags/menu_footer+is.ini | 1 - databags/menu_footer+it.ini | 1 - databags/menu_footer+ka.ini | 1 - databags/menu_footer+ko.ini | 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/pagenav+de.ini | 1 - databags/pagenav+es.ini | 1 - databags/pagenav+fr.ini | 1 - databags/pagenav+it.ini | 1 - databags/pagenav+pt-BR.ini | 1 - databags/pagenav+ru.ini | 1 - databags/{pagenav+en.ini => pagenav.ini} | 0 lego | 2 +- templates/pagenav.html | 2 +- 37 files changed, 2 insertions(+), 36 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini deleted file mode 120000 index c9b2dc8..0000000 --- a/databags/menu+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 120000 index 6bb02de..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 120000 index 1fa7edf..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 120000 index fd8def3..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 120000 index 5366289..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini deleted file mode 120000 index 7c2858b..0000000 --- a/databags/menu+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini deleted file mode 120000 index b02aed7..0000000 --- a/databags/menu+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini deleted file mode 120000 index fcdde73..0000000 --- a/databags/menu+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini deleted file mode 120000 index 336d4ad..0000000 --- a/databags/menu+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini deleted file mode 120000 index 31e262b..0000000 --- a/databags/menu+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini deleted file mode 120000 index fd27afb..0000000 --- a/databags/menu+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini deleted file mode 120000 index 6f30a3e..0000000 --- a/databags/menu+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini deleted file mode 120000 index 8a01592..0000000 --- a/databags/menu+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini deleted file mode 120000 index 425a6f8..0000000 --- a/databags/menu+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini deleted file mode 120000 index 5dd8aed..0000000 --- a/databags/menu_footer+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini deleted file mode 120000 index 851da53..0000000 --- a/databags/menu_footer+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini deleted file mode 120000 index c52cdcb..0000000 --- a/databags/menu_footer+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini deleted file mode 120000 index 7ce02c3..0000000 --- a/databags/menu_footer+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini deleted file mode 120000 index 056defd..0000000 --- a/databags/menu_footer+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini deleted file mode 120000 index 2474621..0000000 --- a/databags/menu_footer+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini deleted file mode 120000 index 8225a53..0000000 --- a/databags/menu_footer+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini deleted file mode 120000 index fd41467..0000000 --- a/databags/menu_footer+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini deleted file mode 120000 index 6ff3bf2..0000000 --- a/databags/menu_footer+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini deleted file mode 120000 index 5198e0f..0000000 --- a/databags/menu_footer+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini deleted file mode 120000 index ad782bc..0000000 --- a/databags/menu_footer+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini deleted file mode 120000 index 2c88858..0000000 --- a/databags/menu_footer+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini deleted file mode 120000 index 0fd8366..0000000 --- a/databags/menu_footer+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/databags/pagenav+de.ini b/databags/pagenav+de.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+de.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+es.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+fr.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+it.ini b/databags/pagenav+it.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+it.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+pt-BR.ini b/databags/pagenav+pt-BR.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+ru.ini b/databags/pagenav+ru.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+ru.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+en.ini b/databags/pagenav.ini similarity index 100% rename from databags/pagenav+en.ini rename to databags/pagenav.ini diff --git a/lego b/lego index 07eaef9..6a550fa 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 07eaef9800b90b8de1c490dedc95928d3b789cbf +Subproject commit 6a550faea39a534af47923a01bd29d138365819f diff --git a/templates/pagenav.html b/templates/pagenav.html index 0a6aa0f..7d38397 100644 --- a/templates/pagenav.html +++ b/templates/pagenav.html @@ -2,7 +2,7 @@ <div class="row flex-xl-nowrap {{ bag('alternatives', this.alt, 'order') }}"> <div class="row col-12 justify-content-center"> <ul class="nav"> - {% set menubag = 'pagenav' + '+' + this.alt %} + {% set menubag = 'pagenav' %} {% for id, item in bag(menubag).items() %} {% set abs_path = item.path %} <li{% if this.is_child_of(abs_path) %} class="nav-item active border-active" {% else %} class="nav-item" {% endif %}>

1 0

[community/staging] Fix relay post-install link
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 110c22f798f167661ca4b209949349814b7a81be Author: Gustavo Gus <gusgustavo(a)users.noreply.github.com> Date: Wed Nov 13 20:22:22 2019 +0000 Fix relay post-install link --- content/relay-operations/technical-setup/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/contents.lr b/content/relay-operations/technical-setup/contents.lr index 6ce43c8..cbd5812 100644 --- a/content/relay-operations/technical-setup/contents.lr +++ b/content/relay-operations/technical-setup/contents.lr @@ -40,6 +40,6 @@ If you are looking to run a relay with minimal effort, we recommend you stick to The installation commands are shown in code blocks and must be executed with root privileges. -Click below in which type of relay do you want to host and don't forget to read [Relay post-install and good practices](relays-post-install-and-good-practices). +Click below in which type of relay do you want to host and don't forget to read [Relay post-install and good practices](/relay/setup/post-install/). --- _slug: {{setup}}

1 0

[community/staging] Rephrase Debian-specific note to general note.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 4b3df13c6d26ec9c4b928ce8dd7c7d66c2af75ae Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Nov 26 09:27:02 2019 -0800 Rephrase Debian-specific note to general note. It doesn't just apply to Debian. It applies to Ubuntu as well. Thanks to Micah for pointing this out! --- .../relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9596a38..7f302c6 100644 --- a/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr +++ b/content/relay-operations/technical-setup/bridge/debian-ubuntu/contents.lr @@ -60,7 +60,7 @@ Don't forget to change the `ORPort`, `ServerTransportListenAddr`, `ContactInfo`, If your bridge is behind a firewall or NAT, make sure to open both ports. You can use [our reachability test](https://bridges.torproject.org/scan/) to see if your obfs4 port is reachable from the Internet. -Under Debian, you will also need to set `NoNewPrivileges=no` in `/lib/systemd/system/tor(a)default.service` and `/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356)) +You will also need to set `NoNewPrivileges=no` in `/lib/systemd/system/tor(a)default.service` and `/lib/systemd/system/tor@.service` and then run `systemctl daemon-reload`. (see [bug #18356](https://trac.torproject.org/projects/tor/ticket/18356)) ### 4. Restart tor

1 0

[community/staging] Update instructions to match new docker workflow.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 5d8c76860a2aa2de29d054cfc29a520a73b7f9fc Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Nov 20 13:23:30 2019 -0800 Update instructions to match new docker workflow. --- .../technical-setup/bridge/docker/contents.lr | 47 ++++++++++++---------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index f401b1e..ebc4b97 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -6,37 +6,42 @@ title: Docker --- body: -We are maintaining a docker container that runs an obfs4 bridge. This guide -walks you through setting up this container. First, download the container: +### 1. Install the container + +We are maintaining a docker container that runs an obfs4 bridge. First, +download the container: ``` docker pull phwinter/obfs4-bridge:latest ``` -Now, it's time to run the container. You can choose between two options: +### 2. Deploy the container + +We provide a Makefile that makes it easy to deploy the container. First, +[download the +Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), +and then run: -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 - ``` - The script will tell you what ports it chose, and your container ID. Make - sure that **both** ports are forwarded in your firewall. +``` +make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +``` -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. +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. +If everything worked fine, you should see output similar to the following: + +``` +201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108 +Make sure that port X and Y are forwarded in your firewall. +``` - ``` - 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 - ``` +That's it! Your container (identified by the first line of output) is now +bootstrapping your new obfs4 bridge. - Again, make sure that **both** ports are forwarded by your firewall. +### 3. Monitor your logs -That's it! Your container should now be bootstrapping your new obfs4 bridge. -You can inspect its logs by running: +You can inspect your bridge's logs by running: ``` docker logs CONTAINER_ID

1 0

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

21 Mar '21

commit c3ea4bb0980d1c30d7674359771ecab54b9c1a7d Author: hiro <hiro(a)torproject.org> Date: Mon Nov 25 18:32:48 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7f196bc..3409e3e 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f196bc35e6bc2555e9a13ee024f322840433954 +Subproject commit 3409e3eebc2ffca079bf890b5ecb5add6fceccbc

1 0

[community/staging] Add instructions on how to upgrade a container.
by hiro＠torproject.org 21 Mar '21

21 Mar '21

commit 17bb36d926b9ad67af4dc7a504c8c36367d4a608 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Nov 26 09:25:21 2019 -0800 Add instructions on how to upgrade a container. --- .../technical-setup/bridge/docker/contents.lr | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index aff4cf2..9c7cf44 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -40,7 +40,19 @@ That's it! Your container (identified by the first line of output) is now bootstrapping your new obfs4 bridge. If you want to run more than one bridge on a single machine, run `make deploy` again, but with a different set of ports. -### 3. Monitor your logs +### 3. Upgrade a 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: + +``` +docker stop CONTAINER_ID +docker rm CONTAINER_ID +docker pull phwinter/obfs4-bridge:latest +make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +``` + +### 4. Monitor your logs You can inspect your bridge's logs by running:

1 0

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

21 Mar '21

commit d654c53eca0e179ef145c25a36f4917e62c154e7 Author: Philipp Winter <phw(a)nymity.ch> Date: Tue Nov 26 15:45:42 2019 -0800 Refactor docker installation instructions. --- .../technical-setup/bridge/docker/contents.lr | 50 +++++++++++++++++----- 1 file changed, 39 insertions(+), 11 deletions(-) diff --git a/content/relay-operations/technical-setup/bridge/docker/contents.lr b/content/relay-operations/technical-setup/bridge/docker/contents.lr index 9c7cf44..272afcf 100644 --- a/content/relay-operations/technical-setup/bridge/docker/contents.lr +++ b/content/relay-operations/technical-setup/bridge/docker/contents.lr @@ -17,19 +17,30 @@ docker pull phwinter/obfs4-bridge:latest ### 2. Deploy a container -We provide a Makefile that makes it easy to deploy a container. First, -[download the -Makefile](https://dip.torproject.org/torproject/anti-censorship/docker-obfs4-bridge/raw/master/Makefile), -and then run: +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: ``` -make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +# Your bridge's Tor port. +export OR_PORT=X +# Your bridge's obfs4 port. +export PT_PORT=Y +# Your email address. +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. -If everything worked fine, you should see output similar to the following: +With your bridge configuration in place, you can now deploy the container: + +``` +source bridge.sh && make deploy +``` + +You should now see output similar to the following: ``` 201fbd2b4d28e6f226978f27547edd79272871c5949bf8aab3872c983156a108 @@ -37,21 +48,38 @@ 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. If you want to run more than one bridge on -a single machine, run `make deploy` again, but with a different set of ports. +bootstrapping your new obfs4 bridge. -### 3. Upgrade a container +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 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: +container, delete it, pull the latest image, and finally deploy it again: ``` docker stop CONTAINER_ID docker rm CONTAINER_ID docker pull phwinter/obfs4-bridge:latest -make deploy OR_PORT=X PT_PORT=Y EMAIL=Z +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. + ### 4. Monitor your logs You can inspect your bridge's logs by running:

1 0

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

21 Mar '21

commit 6e38bca0a62530ed137e8d93c2d54704103a852e Author: hiro <hiro(a)torproject.org> Date: Wed Nov 27 14:32:44 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7c0e9ee..d892ab1 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7c0e9ee42a4cdef87ebb8eefa7dde2df89403c94 +Subproject commit d892ab188dbc30f5827c93fc851506e383b48715

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits March 2021