- tor-commits - lists.torproject.org

[community/translations] content updates
by emmapeel＠torproject.org 30 Oct '21

30 Oct '21

commit 00e9358488b433ce8d2c7f71a94f3f78c8ec9340 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Oct 30 08:48:48 2021 +0200 content updates --- content/relay/setup/guard/centosrhel/contents.lr | 78 ------------------ .../setup/guard/centosrhel/updates/contents.lr | 94 ---------------------- content/relay/setup/guard/debianubuntu/contents.lr | 60 -------------- .../setup/guard/debianubuntu/updates/contents.lr | 63 --------------- databags/onions.ini | 2 +- 5 files changed, 1 insertion(+), 296 deletions(-) diff --git a/content/relay/setup/guard/centosrhel/contents.lr b/content/relay/setup/guard/centosrhel/contents.lr deleted file mode 100644 index e5e7afd..0000000 --- a/content/relay/setup/guard/centosrhel/contents.lr +++ /dev/null @@ -1,78 +0,0 @@ -_model: page ---- -color: primary ---- -title: CentOS/RHEL ---- -body: - -# 1. Enable Automatic Software Updates - -One of the most important things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. Follow the instructions to enable [automatic software updates](updates) for your operating system. - -# 2. Enable the EPEL repository - -To install `tor` package on CentOS/RHEL, you need to install the [EPEL](https://fedoraproject.org/wiki/EPEL) repository first: - -`yum install epel-release` - -# 3. Add the following to /etc/yum.repos.d/tor.repo and then install the tor package. - -``` -[tor] -name=Tor for Enterprise Linux $releasever - $basearch -baseurl=https://rpm.torproject.org/centos/$releasever/$basearch -enabled=1 -gpgcheck=1 -gpgkey=https://rpm.torproject.org/centos/public_gpg.key -cost=100 -``` - -`yum install tor` - -When you install the first package from the EPEL repository you will be asked about verifying the EPEL GPG signing key. -Please ensure the key matches with the one available on the [Fedora Project website](https://getfedora.org/keys/). - -# 4. Put the tor configuration file `/etc/tor/torrc` in place - -``` -#change the nickname "myNiceRelay" to a name that you like -Nickname myNiceRelay -ORPort 9001 -SocksPort 0 -ExitRelay 0 -# Change the email address below and be aware that it will be published -ContactInfo tor-operator@your-emailaddress-domain -``` - -# 5. Enable and start your Tor relay - -CentOS 7 / RHEL 7: - -``` -systemctl enable tor -systemctl start tor -``` - -CentOS 6 / RHEL 6: - -``` -service tor enable -service tor start -``` - -# 6. Final notes - -If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/). -If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes. - ---- -html: two-columns-page.html ---- -key: 1 ---- -section: Middle/Guard relay ---- -section_id: relay-operations ---- -subtitle: How to deploy a middle/Guard relay on CentOS/RHEL diff --git a/content/relay/setup/guard/centosrhel/updates/contents.lr b/content/relay/setup/guard/centosrhel/updates/contents.lr deleted file mode 100644 index 7f67dcc..0000000 --- a/content/relay/setup/guard/centosrhel/updates/contents.lr +++ /dev/null @@ -1,94 +0,0 @@ -_model: page ---- -color: primary ---- -title: RPM Distributions ---- -body: - -# CentOS and RHEL 8 or later versions - -For CentOS and RHEL 8 or later versions, the dnf-automatic package is the preferred approach: - -``` -dnf install dnf-automatic -``` - -In /etc/dnf/automatic.conf set: - -``` -download_updates = yes -apply_updates = yes -``` - -Enable and start automatic updates via: - -``` -systemctl enable --now dnf-automatic.timer -``` - -Check status of dnf-automatic: -``` -systemctl list-timers *dnf-* -``` - -# CentOS and RHEL 7 or earlier versions - -For CentOS and RHEL 7 or earlier versions, the yum-cron package is the preferred approach: - -``` -yum install yum-cron -``` - -In /etc/yum/yum-cron.conf set: - -``` -download_updates = yes -apply_updates = yes -``` - -Enable and start automatic updates via: - -``` -systemctl start yum-cron.service -``` - -# openSUSE - -First, you need to install the automatic update package - -``` -zypper install yast2-online-update-configuration -``` - -Then start the configuration tool (ncurses based) with: - -``` -yast2 online_update_configuration -``` - -Enable the following settings: - -``` - Automatic Online Update - Interval: Daily - Skip Interactive Patches - Agree with Licenses - Use delta rpms -``` - -Confirm your configuration with OK. - -The official openSUSE documentation can be found [here](https://doc.opensuse.org/documentation/leap/startup/single-html/book.…. ---- -html: two-columns-page.html ---- -key: 1 ---- -section: Automatic Updates ---- -section_id: automatic-updates ---- -_slug: updates ---- -_discoverable: no diff --git a/content/relay/setup/guard/debianubuntu/contents.lr b/content/relay/setup/guard/debianubuntu/contents.lr deleted file mode 100644 index 884e4f9..0000000 --- a/content/relay/setup/guard/debianubuntu/contents.lr +++ /dev/null @@ -1,60 +0,0 @@ -_model: page ---- -color: primary ---- -title: Debian/Ubuntu ---- -body: - -# 1. Enable Automatic Software Updates - -One of the most important things to keeps your relay secure is to install security updates timely and ideally automatically so you can not forget about it. -Follow the instructions to enable [automatic software updates](updates) for your operating system. - -# 2. Configure Tor Package Repository - -Enable the Torproject package repository by following the instructions **[here](https://support.torproject.org/apt/tor-deb-repo/)**. - -# 3. Package Installation - -Install the `tor` package: - -`apt update && apt install tor` - -# 4. Configuration File - -Put the configuration file `/etc/tor/torrc` in place: - -``` -#change the nickname "myNiceRelay" to a name that you like -Nickname myNiceRelay -ORPort 443 -ExitRelay 0 -SocksPort 0 -ControlSocket 0 -# Change the email address below and be aware that it will be published -ContactInfo tor-operator@your-emailaddress-domain -``` - -# 5. Restart the Service - -Restart the tor daemon so your configuration changes take effect: - -`systemctl restart tor@default` - -# 6. Final notes - -If you are having trouble setting up your relay, have a look at our [help section](/relay/getting-help/). -If your relay is now running, check out the [post-install](/relay/setup/post-install/) notes. ---- -html: two-columns-page.html ---- -key: 2 ---- -section: Middle/Guard relay ---- -section_id: relay-operations ---- -subtitle: How to deploy a middle/Guard relay on Debian/Ubuntu ---- -_discoverable: yes diff --git a/content/relay/setup/guard/debianubuntu/updates/contents.lr b/content/relay/setup/guard/debianubuntu/updates/contents.lr deleted file mode 100644 index 34bda83..0000000 --- a/content/relay/setup/guard/debianubuntu/updates/contents.lr +++ /dev/null @@ -1,63 +0,0 @@ -_model: page ---- -color: primary ---- -title: Debian and Ubuntu ---- -_discoverable: no ---- -body: - -# 1. Install the required packages - -``` -apt-get install unattended-upgrades apt-listchanges -``` - -# 2. Edit the configuration file - -Put the lines below into the configuration file /etc/apt/apt.conf.d/50unattended-upgrades, everything that was originally inside the generated file can be removed before you add the lines below. - -``` -Unattended-Upgrade::Origins-Pattern { - "origin=Debian,codename=${distro_codename},label=Debian-Security"; - "origin=TorProject"; -}; -Unattended-Upgrade::Package-Blacklist { -}; -``` - -#3. Automatically reboot - -If you want to automatically reboot add the following at the the end of the file `/etc/apt/apt.conf.d/50unattended-upgrades`: - -``` -Unattended-Upgrade::Automatic-Reboot "true"; -``` - -Update the file `/etc/apt/apt.conf.d/20auto-upgrades` with the following content - -``` -APT::Periodic::Update-Package-Lists "1"; -APT::Periodic::AutocleanInterval "5"; -APT::Periodic::Unattended-Upgrade "1"; -APT::Periodic::Verbose "1"; -``` - -# 4. Test - -You can test your unattended-upgrades setup with the following command: - -``` -sudo unattended-upgrade -d -``` ---- -html: two-columns-page.html ---- -key: 1 ---- -section: Automatic Updates ---- -section_id: automatic-updates ---- -_slug: updates diff --git a/databags/onions.ini b/databags/onions.ini index 5f1470b..d00380f 100644 --- a/databags/onions.ini +++ b/databags/onions.ini @@ -4,7 +4,7 @@ image = /static/images/onions/png/propublica.png label = ProPublica [nytimes] -link = https://www.nytimes3xbfgragh.onion +link = https://www.nytimesn7cgmftshazwhfgzm37qxb44r64ytbb2dj3x62d2lljsciiyd.onion image = /static/images/onions/png/nytimes.png label = The New York Times

1 0

[community/translations] frontend fixes
by emmapeel＠torproject.org 30 Oct '21

30 Oct '21

commit 3df44d08dd5712b85992e0e85982c9a73def853a Author: emma peel <emma.peel(a)riseup.net> Date: Fri Oct 29 12:34:37 2021 +0200 frontend fixes --- templates/home.html | 2 +- templates/outreach.html | 2 +- templates/training.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/home.html b/templates/home.html index f95a873..b81314c 100644 --- a/templates/home.html +++ b/templates/home.html @@ -14,7 +14,7 @@ <h2 class="card-title ">{{ _(child.title) }}</h2> <p class="card-text">{{ _(child.subtitle) }}</p> <div class="illo-container"> - <img src="/static/images/home/png{{ this.path }}.png" class="img-fluid" alt="{{ _(child.section) }}" /> + <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ _(child.section) }}" /> </div> </div> <a href="{{ child.path|url }}" class="btn btn-primary">{{ _(child.cta) }}</a> diff --git a/templates/outreach.html b/templates/outreach.html index a640059..4a606f3 100644 --- a/templates/outreach.html +++ b/templates/outreach.html @@ -4,7 +4,7 @@ {{ this.body }} </div> <div class="col-lg-5"> - <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> + <img src="/static/images/home/png{{ this.path }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> <div class="row"> diff --git a/templates/training.html b/templates/training.html index 39d6df0..c3b5a5b 100644 --- a/templates/training.html +++ b/templates/training.html @@ -4,7 +4,7 @@ {{ this.body }} </div> <div class="col-lg-5"> - <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> + <img src="/static/images/home/png{{ this.path }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> </div> </div> <div class="row">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 30 Oct '21

30 Oct '21

commit 97ff6e8b6d2fe8824caec2e8b5a5fb02edbc0fc3 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 30 04:16:35 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- es_AR.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es_AR.po b/es_AR.po index 6389768f1e..4896c31779 100644 --- a/es_AR.po +++ b/es_AR.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-04 16:34+0200\n" -"PO-Revision-Date: 2021-10-28 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-10-30 03:59+0000\n" +"Last-Translator: Zuhualime Akoochimoya\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 30 Oct '21

30 Oct '21

commit 0210d168d0096b024df84e3f8a2afd7b1d401273 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Oct 30 04:15:48 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- es_AR.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/es_AR.po b/es_AR.po index 6389768f1e..8c272e9d44 100644 --- a/es_AR.po +++ b/es_AR.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-04 16:34+0200\n" -"PO-Revision-Date: 2021-10-28 09:25+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-10-30 03:59+0000\n" +"Last-Translator: Zuhualime Akoochimoya\n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1155,11 +1155,11 @@ msgstr "Lenguaje, contraseña de administración y ajustes adicionales" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:83 msgid "Tor Bridge" -msgstr "" +msgstr "Puente Tor" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:85 msgid "Save the last bridge that you used to connect to Tor" -msgstr "" +msgstr "Guardar el último puente que usaste para conectar a Tor" #: config/chroot_local-includes/usr/src/persistence-setup/lib/Tails/Persistence/Configuration/Presets.pm:98 msgid "Browser Bookmarks"

1 0

[community/master] Add links.ini databag
by gus＠torproject.org 29 Oct '21

29 Oct '21

commit b60bb0553b7c129cadf57f6d4c92f3e26ea4cd36 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Fri Oct 29 11:30:28 2021 +0000 Add links.ini databag fix #235 --- databags/links.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/databags/links.ini b/databags/links.ini new file mode 120000 index 0000000..fa8bbfe --- /dev/null +++ b/databags/links.ini @@ -0,0 +1 @@ +../lego/databags/links.ini \ No newline at end of file

1 0

[community/master] Merge branch '235'
by gus＠torproject.org 29 Oct '21

29 Oct '21

commit 7d14197ecc48f9a777387373244edfd1abdf4800 Merge: c693508 b60bb05 Author: gus <gus(a)torproject.org> Date: Fri Oct 29 17:00:10 2021 -0300 Merge branch '235' databags/links.ini | 1 + 1 file changed, 1 insertion(+)

1 0

[community/master] Change pagenav databag to fit relay path
by gus＠torproject.org 29 Oct '21

29 Oct '21

commit c69350887ed121cbd8dd88c2c3c9406d497be733 Author: HackerNCoder <hackerncoder(a)encryptionin.space> Date: Fri Oct 29 11:52:30 2021 +0000 Change pagenav databag to fit relay path fix #236 --- databags/pagenav.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/pagenav.ini b/databags/pagenav.ini index 57c87f6..c050cc8 100644 --- a/databags/pagenav.ini +++ b/databags/pagenav.ini @@ -14,8 +14,8 @@ label = Outreach path = user-research label = User Research -[relay-operations] -path = relay-operations +[relay] +path = relay label = Relay Operations [onion-services]

1 0

[tor/main] Use TOR_PRIuSZ instead of %ld for CC logging.
by ahf＠torproject.org 29 Oct '21

29 Oct '21

commit ee38ec02f36906f344e4408c6b7a44ef435e1625 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Oct 29 19:08:20 2021 +0000 Use TOR_PRIuSZ instead of %ld for CC logging. This patch fixes the current build of main on Windows. --- src/core/or/congestion_control_flow.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/or/congestion_control_flow.c b/src/core/or/congestion_control_flow.c index 9e0cd670c7..805654664c 100644 --- a/src/core/or/congestion_control_flow.c +++ b/src/core/or/congestion_control_flow.c @@ -447,7 +447,7 @@ flow_control_decide_xoff(edge_connection_t *stream) if (total_buffered > buffer_limit_xoff) { if (!stream->xoff_sent) { - log_info(LD_EDGE, "Sending XOFF: %ld %d", + log_info(LD_EDGE, "Sending XOFF: %"TOR_PRIuSZ" %d", total_buffered, buffer_limit_xoff); tor_trace(TR_SUBSYS(cc), TR_EV(flow_decide_xoff_sending), stream); @@ -544,7 +544,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) /* If we have no drain start timestamp, and we still have * remaining buffer, start the buffering counter */ if (!stream->drain_start_usec && total_buffered > 0) { - log_debug(LD_EDGE, "Began edge buffering: %d %d %ld", + log_debug(LD_EDGE, "Began edge buffering: %d %d %"TOR_PRIuSZ, stream->ewma_rate_last_sent, stream->ewma_drain_rate, total_buffered); @@ -580,7 +580,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) (uint32_t)n_count_ewma(drain_rate, stream->ewma_drain_rate, xon_ewma_cnt); - log_debug(LD_EDGE, "Updating drain rate: %d %d %ld", + log_debug(LD_EDGE, "Updating drain rate: %d %d %"TOR_PRIuSZ, drain_rate, stream->ewma_drain_rate, total_buffered); @@ -600,7 +600,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) if (stream_drain_rate_changed(stream)) { /* If we are still buffering and the rate changed, update * advisory XON */ - log_info(LD_EDGE, "Sending rate-change XON: %d %d %ld", + log_info(LD_EDGE, "Sending rate-change XON: %d %d %"TOR_PRIuSZ, stream->ewma_rate_last_sent, stream->ewma_drain_rate, total_buffered); @@ -608,7 +608,7 @@ flow_control_decide_xon(edge_connection_t *stream, size_t n_written) circuit_send_stream_xon(stream); } } else if (total_buffered == 0) { - log_info(LD_EDGE, "Sending XON: %d %d %ld", + log_info(LD_EDGE, "Sending XON: %d %d %"TOR_PRIuSZ, stream->ewma_rate_last_sent, stream->ewma_drain_rate, total_buffered);

1 0

[tor-browser-build/master] Bug 40366: Use bullseye to build https-everywhere
by boklm＠torproject.org 29 Oct '21

29 Oct '21

commit ad7289e3af09b1883e13305fe49ef24cb218c3b3 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Sep 24 15:56:36 2021 +0200 Bug 40366: Use bullseye to build https-everywhere --- projects/https-everywhere/config | 6 +++--- rbm.conf | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index f51b13c..13fd3bd 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -10,14 +10,14 @@ var: # HTTPS Everywhere is expected to be the same on all platforms. To avoid # building the same thing 4 times, using 4 different container images # (each one with a different suite or architecture), we set the container - # to buster/amd64 for all platforms. This allows us to create only one + # to bullseye/amd64 for all platforms. This allows us to create only one # container image, and also build the extension only one time as the # filename does not contain the platform, and var/build_id should be # the same since there is now nothing platform specific in the build # inputs. This allows us to save a little time and disk space. container: use_container: 1 - suite: buster + suite: bullseye arch: amd64 deps: - git @@ -34,4 +34,4 @@ input_files: - project: python name: python target_prepend: - - common-buster + - common-bullseye diff --git a/rbm.conf b/rbm.conf index dc7072b..b5c0566 100644 --- a/rbm.conf +++ b/rbm.conf @@ -247,13 +247,13 @@ targets: # Don't create mar files to save time build_mar: 0 - # The common-buster target is used to build components that are common to all - # platforms, using Debian Buster. - common-buster: + # The common-bullseye target is used to build components that are common to all + # platforms, using Debian Bullseye. + common-bullseye: var: common: 1 container: - suite: buster + suite: bullseye arch: amd64 pre_pkginst: '' deps:

1 0

[tor-browser-build/master] Bug 40368: Use system's python3 for https-everywhere
by boklm＠torproject.org 29 Oct '21

29 Oct '21

commit ce2c78e4ccc24a4b46ff9336f54b1ec8129e430c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Sep 30 14:40:45 2021 +0200 Bug 40368: Use system's python3 for https-everywhere --- projects/https-everywhere/build | 1 - projects/https-everywhere/config | 6 ++---- rbm.conf | 17 ----------------- 3 files changed, 2 insertions(+), 22 deletions(-) diff --git a/projects/https-everywhere/build b/projects/https-everywhere/build index 88431e0..10dd4bf 100644 --- a/projects/https-everywhere/build +++ b/projects/https-everywhere/build @@ -1,6 +1,5 @@ #!/bin/bash [% c("var/set_default_env") -%] -[% pc('python', 'var/setup', { python_tarfile => c('input_files_by_name/python') }) %] tar xf [% project %]-[% c('version') %].tar.gz cd [% project %]-[% c('version') %] ./make.sh diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 13fd3bd..9af5ff6 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -27,11 +27,9 @@ var: - rsync - zip - unzip + - python3 + - python3-distutils pre_pkginst: '' input_files: - project: container-image - - project: python - name: python - target_prepend: - - common-bullseye diff --git a/rbm.conf b/rbm.conf index b5c0566..7295953 100644 --- a/rbm.conf +++ b/rbm.conf @@ -247,23 +247,6 @@ targets: # Don't create mar files to save time build_mar: 0 - # The common-bullseye target is used to build components that are common to all - # platforms, using Debian Bullseye. - common-bullseye: - var: - common: 1 - container: - suite: bullseye - arch: amd64 - pre_pkginst: '' - deps: - - build-essential - - python - - automake - - libtool - - zip - - unzip - torbrowser-android-armv7: - android-armv7 - android

1 0