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

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by nickm＠torproject.org 28 May '21

28 May '21

commit f8d028e14a301a77696144fd2bcab91becf51921 Merge: 6d11a0c61f 8b6e919086 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.5' into release-0.4.5 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] Stop using the "x$FOO" idiom in git-resquash.sh
by nickm＠torproject.org 28 May '21

28 May '21

commit 8b6e919086ad6dde681516fe52d744afa3ffcc89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:02:08 2021 -0400 Stop using the "x$FOO" idiom in git-resquash.sh The new version of shellcheck says that that this idiom is unnecessary, and its presence here is making the shellcheck tests fail. No changes file needed, since this is not user-facing code. --- scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh index e0f26ecdc4..f37950c9b0 100755 --- a/scripts/git/git-resquash.sh +++ b/scripts/git/git-resquash.sh @@ -7,7 +7,7 @@ set -e PARENT="$1" -if test "x$PARENT" = "x"; then +if test "$PARENT" = ""; then echo "You must specify the parent branch." exit 1 fi @@ -32,12 +32,12 @@ else USE_KEEP_BASE=1 fi -if test "x$USE_KEEP_BASE" = "x1" ; then +if test "$USE_KEEP_BASE" = "1" ; then exec git rebase -i --autosquash --keep-base "${PARENT}" else REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) - if test "x${REV}" = "x"; then + if test "${REV}" = ""; then echo "No changes here since ${PARENT}" exit 1 fi

1 0

[tor/release-0.4.6] Create an 0.4.6.4-rc changelog.
by nickm＠torproject.org 28 May '21

28 May '21

commit a3c2dea3f66d503249b092932d96db6781b9ec4d Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:00:47 2021 -0400 Create an 0.4.6.4-rc changelog. --- ChangeLog | 36 ++++++++++++++++++++++++++++++++++++ changes/bug40317 | 5 ----- changes/bug40375 | 5 ----- changes/bug40399 | 5 ----- changes/ticket40370 | 4 ---- changes/ticket40374 | 4 ---- 6 files changed, 36 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index ba6000e356..e17de4a55b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,39 @@ +Changes in version 0.4.6.4-rc - 2021-05-?? + Tor 0.4.6.4-rc fixes a few bugs from previous releases. This, we hope, + the final release candidate in its series: unless major new issues are + found, the next release will be stable. + + o Minor features (compatibility): + - Remove an assertion function related to TLS renegotiation. It was + used nowhere outside the unit tests, and it was breaking + compilation with recent alpha releases of OpenSSL 3.0.0. Closes + ticket 40399. + + o Minor bugfixes (consensus handling): + - Avoid a set of bugs that could be caused by inconsistently + preferring an out-of-date consensus stored in a stale directory + cache over a more recent one stored on disk as the latest + consensus. Fixes bug 40375; bugfix on 0.3.1.1-alpha. + + o Minor bugfixes (control, sandbox): + - Allow the control command SAVECONF to succeed when the seccomp + sandbox is enabled, and make SAVECONF keep only one backup file to + simplify implementation. Previously SAVECONF allowed a large + number of backup files, which made it incompatible with the + sandbox. Fixes bug 40317; bugfix on 0.2.5.4-alpha. Patch by + Daniel Pinto. + + o Minor bugfixes (metrics port): + - Fix a bug that made tor try to re-bind() on an already open + MetricsPort every 60 seconds. Fixes bug 40370; bugfix + on 0.4.5.1-alpha. + + o Removed features: + - Remove unneeded code for parsing private keys in directory + documents. This code was only used for client authentication in v2 + onion services, which are now unsupported. Closes ticket 40374. + + Changes in version 0.4.6.3-rc - 2021-05-10 Tor 0.4.6.3-rc is the first release candidate in its series. It fixes a few small bugs from previous versions, and adds a better error diff --git a/changes/bug40317 b/changes/bug40317 deleted file mode 100644 index 18ec499a51..0000000000 --- a/changes/bug40317 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (control, sandbox): - - Allows the control command SAVECONF to succeed when the seccomp - sandbox is enabled. Makes SAVECONF keep only one backup file to - simplify implementation. Fixes bug 40317; bugfix on 0.2.5.4-alpha. - Patch by Daniel Pinto. diff --git a/changes/bug40375 b/changes/bug40375 deleted file mode 100644 index 7ac32bc628..0000000000 --- a/changes/bug40375 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor bugfixes (consensus handling): - - Avoid a set of bugs that could be caused by inconsistently preferring - an out-of-date consensus stored in a stale directory cache over - a more recent one stored on disk as the latest consensus. - Fixes bug 40375; bugfix on 0.3.1.1-alpha. diff --git a/changes/bug40399 b/changes/bug40399 deleted file mode 100644 index 7954b85eaf..0000000000 --- a/changes/bug40399 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features (compatibility): - - Remove an assertion function related to TLS renegotiation. - It was used nowhere outside the unit tests, and it was breaking - compilation with recent alpha releases of OpenSSL 3.0.0. - Closes ticket 40399. diff --git a/changes/ticket40370 b/changes/ticket40370 deleted file mode 100644 index fcdb0eb173..0000000000 --- a/changes/ticket40370 +++ /dev/null @@ -1,4 +0,0 @@ - o Minor bugfix (metrics port): - - Fix a bug that made tor try to re-bind() every 60 seconds on an already - open MetricsPort. Fixes bug 40370; bugfix on 0.4.5.1-alpha. - diff --git a/changes/ticket40374 b/changes/ticket40374 deleted file mode 100644 index 8b6e99b8af..0000000000 --- a/changes/ticket40374 +++ /dev/null @@ -1,4 +0,0 @@ - o Removed features: - - Remove unneeded code for parsing private keys in directory documents. - This code was only used for client authentication in v2 onion - services, which are now unsupported. Closes ticket 40374.

1 0

[tor/release-0.4.6] Stop using the "x$FOO" idiom in git-resquash.sh
by nickm＠torproject.org 28 May '21

28 May '21

commit 8b6e919086ad6dde681516fe52d744afa3ffcc89 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:02:08 2021 -0400 Stop using the "x$FOO" idiom in git-resquash.sh The new version of shellcheck says that that this idiom is unnecessary, and its presence here is making the shellcheck tests fail. No changes file needed, since this is not user-facing code. --- scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/git/git-resquash.sh b/scripts/git/git-resquash.sh index e0f26ecdc4..f37950c9b0 100755 --- a/scripts/git/git-resquash.sh +++ b/scripts/git/git-resquash.sh @@ -7,7 +7,7 @@ set -e PARENT="$1" -if test "x$PARENT" = "x"; then +if test "$PARENT" = ""; then echo "You must specify the parent branch." exit 1 fi @@ -32,12 +32,12 @@ else USE_KEEP_BASE=1 fi -if test "x$USE_KEEP_BASE" = "x1" ; then +if test "$USE_KEEP_BASE" = "1" ; then exec git rebase -i --autosquash --keep-base "${PARENT}" else REV=$(git log --reverse --format='%H' "${PARENT}..HEAD" | head -1) - if test "x${REV}" = "x"; then + if test "${REV}" = ""; then echo "No changes here since ${PARENT}" exit 1 fi

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.5' into maint-0.4.6
by nickm＠torproject.org 28 May '21

28 May '21

commit e1f0b9fb1eb6cf8e57655bb9db4224b5ce080d0f Merge: fd3678fa60 8b6e919086 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.5' into maint-0.4.6 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.6] Merge branch 'maint-0.4.6' into release-0.4.6
by nickm＠torproject.org 28 May '21

28 May '21

commit 2af341b2eaf8f9d25fc2ba35a1e6b02e5dcac112 Merge: a3c2dea3f6 e1f0b9fb1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri May 28 08:03:43 2021 -0400 Merge branch 'maint-0.4.6' into release-0.4.6 scripts/git/git-resquash.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

1 0

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

28 May '21

commit ce248bfa0fb72837c57ef8e32711a9f20881ec28 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 28 00:46:51 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko.po b/ko.po index b62227c24c..0453b3155d 100644 --- a/ko.po +++ b/ko.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-26 10:48+0200\n" -"PO-Revision-Date: 2021-05-27 23:45+0000\n" +"PO-Revision-Date: 2021-05-28 00:41+0000\n" "Last-Translator: 장민준\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0

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

28 May '21

commit 6234da9ddb3bacc8960628f5167c87b3cf84d3b7 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 28 00:46:01 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- ko.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ko.po b/ko.po index 6da8348dcc..68503cd7c6 100644 --- a/ko.po +++ b/ko.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-26 10:48+0200\n" -"PO-Revision-Date: 2021-05-27 23:45+0000\n" +"PO-Revision-Date: 2021-05-28 00:41+0000\n" "Last-Translator: 장민준\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n" @@ -1980,7 +1980,7 @@ msgid "" "You are not connected to a local network yet.\\n\\nTo be able to start the " "Unsafe Browser, you first need to connect to a Wi-Fi, wired, or mobile " "network." -msgstr "" +msgstr "아직 로컬 네트워크에 연결되어 있지 않습니다.\\n\\n안전하지 않은 브라우저를 시작하려면 먼저 Wi-Fi, 유선 또는 모바일 네트워크에 연결해야 합니다." #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:135 msgid "Failed to run browser." @@ -2115,7 +2115,7 @@ msgstr "잘못된 연락처 OpenPGP 공증 키 차단" #: config/chroot_local-includes/usr/local/bin/tca:128 msgid "You turned on Offline Mode in the Welcome Screen." -msgstr "" +msgstr "시작 화면에서 오프라인 모드를 설정했습니다." #: config/chroot_local-includes/usr/local/bin/tca:129 msgid "It is impossible to connect to Tor in Offline Mode."

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 28 May '21

28 May '21

commit 52d7afec12b17d03a82827db28a6e46c8792b1d2 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 28 00:17:57 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- id/network-settings.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/id/network-settings.dtd b/id/network-settings.dtd index b0508f17e5..03100e6761 100644 --- a/id/network-settings.dtd +++ b/id/network-settings.dtd @@ -83,10 +83,10 @@ <!ENTITY torPreferences.torLogsDialogTitle "Catatan Tor">  -<!ENTITY torConnect.tryAgain "Try Connecting Again"> +<!ENTITY torConnect.tryAgain "Coba Sambungkan Kembali"> <!ENTITY torConnect.offline "Luring"> -<!ENTITY torConnect.connectMessage "Changes to Tor Settings will not take effect until you connect to the Tor Network"> -<!ENTITY torConnect.tryAgainMessage "Tor Browser has failed to establish a connection to the Tor Network"> +<!ENTITY torConnect.connectMessage "Perubahan untuk Pengaturan Tor tidak akan berdampak sampai Anda tersambung ke Jaringan Tor"> +<!ENTITY torConnect.tryAgainMessage "Tor Browser telah gagal membuat koneksi ke Jaringan Tor"> <!ENTITY torConnect.connectingConcise "Menyambung..."> <!ENTITY torConnect.connectedConcise "Terhubung"> -<!ENTITY torConnect.copyLog "Copy Tor Logs"> +<!ENTITY torConnect.copyLog "Salin Log Tor">

1 0

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

28 May '21

commit bdec9f7a541379569cfd4dc3a90f545d008495dd Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 27 23:46:43 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- ko.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ko.po b/ko.po index a883e308ab..b62227c24c 100644 --- a/ko.po +++ b/ko.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-05-26 10:48+0200\n" -"PO-Revision-Date: 2021-05-27 12:17+0000\n" +"PO-Revision-Date: 2021-05-27 23:45+0000\n" "Last-Translator: 장민준\n" "Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n" "MIME-Version: 1.0\n"

1 0