- tor-commits - lists.torproject.org

[lego/master] Update assets/static/css/images/home/png/yec-activist-de@2x.png, assets/static/css/images/home/png/yec-activist-de@3x.png, assets/static/css/images/home/png/yec-activist-el@2x.png, assets/static/css/images/home/png/yec-activist-el@3x.png, assets/static/css/images/home/png/yec-activist-mk@2x.png, assets/static/css/images/home/png/yec-activist-mk@3x.png
by kez＠torproject.org 03 Nov '21

03 Nov '21

commit 0d9efebbaec064730fba8438dda2d666585247a0 Author: Duncan <duncan(a)torproject.org> Date: Wed Nov 3 15:04:34 2021 +0000 Update assets/static/css/images/home/png/yec-activist-de(a)2x.png, assets/static/css/images/home/png/yec-activist-de(a)3x.png, assets/static/css/images/home/png/yec-activist-el(a)2x.png, assets/static/css/images/home/png/yec-activist-el(a)3x.png, assets/static/css/images/home/png/yec-activist-mk(a)2x.png, assets/static/css/images/home/png/yec-activist-mk(a)3x.png --- .../png/{yec-activist-de_2x.png => yec-activist-de(a)2x.png} | Bin .../png/{yec-activist-de_3x.png => yec-activist-de(a)3x.png} | Bin .../png/{yec-activist-el_2x.png => yec-activist-el(a)2x.png} | Bin .../png/{yec-activist-el_3x.png => yec-activist-el(a)3x.png} | Bin .../png/{yec-activist-mk_2x.png => yec-activist-mk(a)2x.png} | Bin .../png/{yec-activist-mk_3x.png => yec-activist-mk(a)3x.png} | Bin 6 files changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/css/images/home/png/yec-activist-de_2x.png b/assets/static/css/images/home/png/yec-activist-de(a)2x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-de_2x.png rename to assets/static/css/images/home/png/yec-activist-de(a)2x.png diff --git a/assets/static/css/images/home/png/yec-activist-de_3x.png b/assets/static/css/images/home/png/yec-activist-de(a)3x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-de_3x.png rename to assets/static/css/images/home/png/yec-activist-de(a)3x.png diff --git a/assets/static/css/images/home/png/yec-activist-el_2x.png b/assets/static/css/images/home/png/yec-activist-el(a)2x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-el_2x.png rename to assets/static/css/images/home/png/yec-activist-el(a)2x.png diff --git a/assets/static/css/images/home/png/yec-activist-el_3x.png b/assets/static/css/images/home/png/yec-activist-el(a)3x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-el_3x.png rename to assets/static/css/images/home/png/yec-activist-el(a)3x.png diff --git a/assets/static/css/images/home/png/yec-activist-mk_2x.png b/assets/static/css/images/home/png/yec-activist-mk(a)2x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-mk_2x.png rename to assets/static/css/images/home/png/yec-activist-mk(a)2x.png diff --git a/assets/static/css/images/home/png/yec-activist-mk_3x.png b/assets/static/css/images/home/png/yec-activist-mk(a)3x.png similarity index 100% rename from assets/static/css/images/home/png/yec-activist-mk_3x.png rename to assets/static/css/images/home/png/yec-activist-mk(a)3x.png

1 0

[translation/tpo-web_completed] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed
by translation＠torproject.org 03 Nov '21

03 Nov '21

commit 4d2e2fbb8092ff430fd90c1e29b5754c357fc94e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 3 15:48:05 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web_completed --- contents+hu.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index ed1df10340..9c6f801fb8 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -6,8 +6,8 @@ # erinm, 2020 # AdminLMH <lehetmashogy(a)i2pmail.org>, 2021 # Tamas Pajor <tpajor17(a)icloud.com>, 2021 -# vargaviktor <viktor.varga(a)gmail.com>, 2021 # Emma Peel, 2021 +# vargaviktor <viktor.varga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-28 13:28+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1603,11 +1603,12 @@ msgstr "Banner bezárása" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Privacy is a human right" -msgstr "" +msgstr "A magánélet emberi jog" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" +"A támogatásával egyező összeget ad a Friends of Tor, 150 000 dollárig." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000." @@ -1618,7 +1619,7 @@ msgstr "" #: lego/templates/banner.html:31 lego/templates/banner.html:33 #: templates/banner.html:31 templates/banner.html:33 msgid "Donate now" -msgstr "" +msgstr "Adományozzon most" #: lego/templates/footer.html:13 lego/templates/footer.html:22 #: lego/templates/navbar.html:96 templates/footer.html:13

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 03 Nov '21

03 Nov '21

commit 63c6ad0fd7d141657ea2f102e0f985bb9dceb9d2 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 3 15:48:02 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+hu.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index 9627486ac0..9c6f801fb8 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -6,8 +6,8 @@ # erinm, 2020 # AdminLMH <lehetmashogy(a)i2pmail.org>, 2021 # Tamas Pajor <tpajor17(a)icloud.com>, 2021 -# vargaviktor <viktor.varga(a)gmail.com>, 2021 # Emma Peel, 2021 +# vargaviktor <viktor.varga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-10-28 13:28+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1608,7 +1608,7 @@ msgstr "A magánélet emberi jog" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" -"A támogatásoddal egyező összeget ad a Friends of Tor, 150 000 dollárig." +"A támogatásával egyező összeget ad a Friends of Tor, 150 000 dollárig." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

1 0

[translation/tbmanual-contentspot_completed] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot_completed
by translation＠torproject.org 03 Nov '21

03 Nov '21

commit 16d20b24d1d0192dfa0b4542e844503c644ed285 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 3 15:47:19 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspo… --- contents+hu.po | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index c01c4e2dab..db16974f89 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -5,8 +5,8 @@ # David Webb, 2019 # Tamas Pajor <tpajor17(a)icloud.com>, 2019 # Zsolt Repasy <repasy_zsolt(a)yahoo.com>, 2021 -# vargaviktor <viktor.varga(a)gmail.com>, 2021 # Emma Peel, 2021 +# vargaviktor <viktor.varga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-01 21:33+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -139,7 +139,7 @@ msgstr "Hibaelhárítás" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Uninstalling" -msgstr "Eltávolítása" +msgstr "Eltávolítás" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -171,7 +171,7 @@ msgstr "Telepítés" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "PrivChat" -msgstr "" +msgstr "PrivChat" #: https//tb-manual.torproject.org/about/ #: (content/about/contents+en.lrtopic.title) @@ -658,6 +658,8 @@ msgid "" "Some additional flags that can be used with `start-tor-browser.desktop` from" " the command-line:" msgstr "" +"Néhány további opció használható a `start-tor-browser.desktop` paranccsal a " +"parancssorban:" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) @@ -711,7 +713,7 @@ msgstr "" #: https//tb-manual.torproject.org/installation/ #: (content/installation/contents+en.lrtopic.body) msgid "See here on how to [update Tor Browser](../updating/)." -msgstr "" +msgstr "Tekintse meg itt a [Tor Böngésző frissítését](../updating/)." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.title) @@ -2843,6 +2845,8 @@ msgstr "" msgid "" "* Then type `~/Library/Application Support/` in the window and click Go." msgstr "" +"* Majd gépelje be a következőket: `~/Library/Application Support/` az " +"ablakban és kattintson a Mehet gombra." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -4263,11 +4267,12 @@ msgstr "Banner bezárása" #: lego/templates/banner.html:11 templates/banner.html:11 msgid "Privacy is a human right" -msgstr "" +msgstr "A magánélet emberi jog" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" +"Az adományoddal egyező összeget ad a Friends of Tor, 150 000 dollárig." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000." @@ -4278,7 +4283,7 @@ msgstr "" #: lego/templates/banner.html:31 lego/templates/banner.html:33 #: templates/banner.html:31 templates/banner.html:33 msgid "Donate now" -msgstr "" +msgstr "Adományozzon most" #: lego/templates/footer.html:13 lego/templates/footer.html:22 #: lego/templates/navbar.html:96 templates/footer.html:13

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 03 Nov '21

03 Nov '21

commit 5f6d2990ae53bd9aa256928a1f4983fc3057530c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 3 15:47:15 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+hu.po | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/contents+hu.po b/contents+hu.po index ada62ceeeb..db16974f89 100644 --- a/contents+hu.po +++ b/contents+hu.po @@ -5,8 +5,8 @@ # David Webb, 2019 # Tamas Pajor <tpajor17(a)icloud.com>, 2019 # Zsolt Repasy <repasy_zsolt(a)yahoo.com>, 2021 -# vargaviktor <viktor.varga(a)gmail.com>, 2021 # Emma Peel, 2021 +# vargaviktor <viktor.varga(a)gmail.com>, 2021 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-11-01 21:33+CET\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Emma Peel, 2021\n" +"Last-Translator: vargaviktor <viktor.varga(a)gmail.com>, 2021\n" "Language-Team: Hungarian (https://www.transifex.com/otf/teams/1519/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -139,7 +139,7 @@ msgstr "Hibaelhárítás" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) msgid "Uninstalling" -msgstr "Eltávolítása" +msgstr "Eltávolítás" #: https//tb-manual.torproject.org/menu/ #: (content/menu/contents+en.lrtopic.body) @@ -2845,6 +2845,8 @@ msgstr "" msgid "" "* Then type `~/Library/Application Support/` in the window and click Go." msgstr "" +"* Majd gépelje be a következőket: `~/Library/Application Support/` az " +"ablakban és kattintson a Mehet gombra." #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.body) @@ -4270,7 +4272,7 @@ msgstr "A magánélet emberi jog" #: lego/templates/banner.html:15 templates/banner.html:15 msgid "Your donation will be matched by Friends of Tor, up to $150,000." msgstr "" -"A támogatásoddal egyező összeget ad a Friends of Tor, 150 000 dollárig." +"Az adományoddal egyező összeget ad a Friends of Tor, 150 000 dollárig." #: lego/templates/banner.html:26 templates/banner.html:26 msgid "Your donation will be matched by Friends of Tor, up to $100,000."

1 0

[gettor-web/main] Remove lektors-builds ref
by lavamind＠torproject.org 03 Nov '21

03 Nov '21

commit fa0f22cbeb6cb14db585ff6d846db629910d9acb Author: Jerome Charaoui <jerome(a)riseup.net> Date: Wed Nov 3 11:19:22 2021 -0400 Remove lektors-builds ref --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca87117..e56761a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,4 +4,3 @@ variables: include: project: tpo/tpa/ci-templates file: lektor.yml - ref: lektor-builds

1 0

[gettor-web/main] Add .gitlab-ci.yml to build and deploy to pages (tpo/tpa/team#40462)
by lavamind＠torproject.org 03 Nov '21

03 Nov '21

commit a530498940d837bf3f5e614212c588379e21453c Author: Jerome Charaoui <jerome(a)riseup.net> Date: Wed Nov 3 11:17:31 2021 -0400 Add .gitlab-ci.yml to build and deploy to pages (tpo/tpa/team#40462) --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..ca87117 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +variables: + TRANSLATION_BRANCH: "gettor-website-contentspot" + +include: + project: tpo/tpa/ci-templates + file: lektor.yml + ref: lektor-builds

1 0

[tor/main] Merge branch 'tor-gitlab/mr/477' into maint-0.4.5
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit ea5eebf431c732b8f1c0e9daa9b7b716c48bc76f Merge: 1e3e921d7d 6e8e1a4e6f Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:52:03 2021 -0400 Merge branch 'tor-gitlab/mr/477' into maint-0.4.5 changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-)

1 0

[tor/main] shellcheck: Remove unused variable in ci-driver.sh
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 33fb0f1d8f77759e27d9372194b826bc4ff3d7ff Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 3 09:50:43 2021 -0400 shellcheck: Remove unused variable in ci-driver.sh Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- scripts/ci/ci-driver.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh index 245922b631..a13e0f6c17 100755 --- a/scripts/ci/ci-driver.sh +++ b/scripts/ci/ci-driver.sh @@ -293,7 +293,6 @@ TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; # Tor version. Only create the variables we need. TOR_VER_AT_LEAST_043=no TOR_VER_AT_LEAST_044=no -TOR_VER_AT_LEAST_046=no # These are the currently supported Tor versions; no need to work with anything # ancient in this script. @@ -321,7 +320,6 @@ case "$TOR_VERSION" in 0.4.6.*) TOR_VER_AT_LEAST_043=yes TOR_VER_AT_LEAST_044=yes - TOR_VER_AT_LEAST_046=yes ;; esac

1 0

[tor/main] relay: Don't allow DirPort on non-IPv4
by dgoulet＠torproject.org 03 Nov '21

03 Nov '21

commit 6e8e1a4e6ff249afd32e7851989ba3d79df9d5b2 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 2 09:34:03 2021 -0400 relay: Don't allow DirPort on non-IPv4 Our code doesn't allow it and so this prevents an assert() crash if the DirPort is for instance IPv6 only. Fixes #40494 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket40494 | 5 +++++ doc/man/tor.1.txt | 3 ++- src/feature/relay/relay_config.c | 13 ++++++++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/changes/ticket40494 b/changes/ticket40494 new file mode 100644 index 0000000000..a0e6c38443 --- /dev/null +++ b/changes/ticket40494 @@ -0,0 +1,5 @@ + o Minor bugfixes (relay): + - Reject IPv6-only DirPorts. Our reachability self-test forces DirPorts to + be IPv4, but our configuration parser allowed them to be IPv6-only, + which led to an assertion failure. Fixes bug 40494; bugfix on + 0.4.5.1-alpha. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 209900832f..7c0071500e 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -2803,7 +2803,8 @@ details.) more than once, but only one advertised DirPort is supported: all but one DirPort must have the **NoAdvertise** flag set. (Default: 0) + + - The same flags are supported here as are supported by ORPort. + The same flags are supported here as are supported by ORPort. This port can + only be IPv4. [[DirPortFrontPage]] **DirPortFrontPage** __FILENAME__:: When this option is set, it takes an HTML file and publishes it as "/" on diff --git a/src/feature/relay/relay_config.c b/src/feature/relay/relay_config.c index c4a5d7f572..8ea0ad8397 100644 --- a/src/feature/relay/relay_config.c +++ b/src/feature/relay/relay_config.c @@ -352,6 +352,7 @@ check_and_prune_server_ports(smartlist_t *ports, int n_orport_listeners = 0; int n_dirport_advertised = 0; int n_dirport_listeners = 0; + int n_dirport_listeners_v4 = 0; int n_low_port = 0; int r = 0; @@ -362,8 +363,12 @@ check_and_prune_server_ports(smartlist_t *ports, if (port->type == CONN_TYPE_DIR_LISTENER) { if (! port->server_cfg.no_advertise) ++n_dirport_advertised; - if (! port->server_cfg.no_listen) + if (! port->server_cfg.no_listen) { ++n_dirport_listeners; + if (port_binds_ipv4(port)) { + ++n_dirport_listeners_v4; + } + } } else if (port->type == CONN_TYPE_OR_LISTENER) { if (! port->server_cfg.no_advertise) { ++n_orport_advertised; @@ -408,6 +413,12 @@ check_and_prune_server_ports(smartlist_t *ports, "address. Tor needs to listen on an IPv4 address too."); r = -1; } + if (n_dirport_advertised && n_dirport_listeners_v4 == 0) { + log_warn(LD_CONFIG, "We are listening on a non-IPv4 DirPort. This is not " + "allowed. Consider either setting an IPv4 address or " + "simply removing it because it is not used anymore."); + r = -1; + } if (n_low_port && options->AccountingMax && (!have_capability_support() || options->KeepBindCapabilities == 0)) {

1 0