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

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit c5922244e27f72a0b974920d56475450932568ff Merge: d6e2516031 9ceb2c317b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:32:12 2021 -0400 Merge branch 'maint-0.3.5' into release-0.3.5 changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Merge remote-tracking branch 'tor-gitlab/mr/386' into maint-0.3.5
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit 9ceb2c317b7a4fe9777599971ef6a2f68e5e6c46 Merge: 520d5c108f ee35291a7c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jun 10 08:31:54 2021 -0400 Merge remote-tracking branch 'tor-gitlab/mr/386' into maint-0.3.5 changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.5] Assert on _all_ failures from RAND_bytes().
by nickm＠torproject.org 14 Jun '21

14 Jun '21

commit c0aa9e0a1b1633d3b221199d516294e14a5db9c6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon May 17 08:50:01 2021 -0400 Assert on _all_ failures from RAND_bytes(). Previously, we would detect errors from a missing RNG implementation, but not failures from the RNG code itself. Fortunately, it appears those failures do not happen in practice when Tor is using OpenSSL's default RNG implementation. Fixes bug 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as TROVE-2021-004. Reported by Jann Horn at Google's Project Zero. --- changes/ticket40390 | 8 ++++++++ src/lib/crypt_ops/crypto_rand.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/ticket40390 b/changes/ticket40390 new file mode 100644 index 0000000000..b56fa4d9da --- /dev/null +++ b/changes/ticket40390 @@ -0,0 +1,8 @@ + o Major bugfixes (security, defense-in-depth): + - Detect a wider variety of failure conditions from the OpenSSL RNG + code. Previously, we would detect errors from a missing RNG + implementation, but not failures from the RNG code itself. + Fortunately, it appears those failures do not happen in practice + when Tor is using OpenSSL's default RNG implementation. + Fixes bug 40390; bugfix on 0.2.8.1-alpha. This issue is also tracked as + TROVE-2021-004. Reported by Jann Horn at Google's Project Zero. diff --git a/src/lib/crypt_ops/crypto_rand.c b/src/lib/crypt_ops/crypto_rand.c index 915fe0870d..206929d6b3 100644 --- a/src/lib/crypt_ops/crypto_rand.c +++ b/src/lib/crypt_ops/crypto_rand.c @@ -525,7 +525,7 @@ crypto_rand_unmocked(char *to, size_t n) /* We consider a PRNG failure non-survivable. Let's assert so that we get a * stack trace about where it happened. */ - tor_assert(r >= 0); + tor_assert(r == 1); #endif }

1 0

[status-site/main] Merge branch 'bug_7' into 'main'
by gk＠torproject.org 14 Jun '21

14 Jun '21

commit 0c80ff06d652c669a363cc895d3a1fb6bf394f3d Merge: afdb7d1 fdd95b3 Author: anarcat <anarcat(a)torproject.org> Date: Mon Jun 14 13:29:10 2021 +0000 Merge branch 'bug_7' into 'main' Bug 7: Remove our cstate fork Closes #7 See merge request tpo/tpa/status-site!8 .gitmodules | 2 +- i18n/en.yaml | 7 +++++++ themes/cstate | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-)

1 0

[status-site/main] Revert "Pick up cstate changes for #6"
by gk＠torproject.org 14 Jun '21

14 Jun '21

commit 724cfd0e5e524c1c709deaaa561e8bb582f0f00f Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 12 19:25:39 2021 +0000 Revert "Pick up cstate changes for #6" This reverts commit bfa36dd506b4a616c170706a4ddc30237bbb169e. --- .gitmodules | 2 +- themes/cstate | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index dd943d4..7a9fc42 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,3 @@ [submodule "themes/cstate"] path = themes/cstate - url = https://gitlab.torproject.org/gk/cstate + url = https://github.com/cstate/cstate diff --git a/themes/cstate b/themes/cstate index b848dc3..b5d0763 160000 --- a/themes/cstate +++ b/themes/cstate @@ -1 +1 @@ -Subproject commit b848dc3f32d3336a74695921cc20f2a7bcf436ab +Subproject commit b5d07632d40437bb87c3faf7b9ece7ca412dce9f

1 0

[status-site/main] Bug 7: Remove our cstate fork
by gk＠torproject.org 14 Jun '21

14 Jun '21

commit fdd95b32b906b130658b8f680735f129c34b3db3 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 12 19:31:17 2021 +0000 Bug 7: Remove our cstate fork We can actually overlay the i18n folder, too, and just add our own new strings there. Thus, no need to maintain a cstate fork or bother upstream with adding strings only we need. Closes: #7. --- i18n/en.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/i18n/en.yaml b/i18n/en.yaml new file mode 100644 index 0000000..cfc9501 --- /dev/null +++ b/i18n/en.yaml @@ -0,0 +1,7 @@ +# English language file for cState - custom Tor Project strings +- id: thisIsOngoing + translation: Ongoing +- id: thisIsNone + translation: None +- id: experimentOngoing + translation: This experiment is still ongoing

1 0

[snowflake/main] fix(client/snowflake.go): prevent wg.Add race condition
by cohosh＠torproject.org 14 Jun '21

14 Jun '21

commit aefabe683f3fba846707a9f3a5e11f9b4be16990 Author: Simone Basso <bassosimone(a)gmail.com> Date: Mon May 3 10:23:03 2021 +0200 fix(client/snowflake.go): prevent wg.Add race condition In VSCode, the staticcheck tool emits this warning: > should call wg.Add(1) before starting the goroutine to > avoid a race (SA2000)go-staticcheck To avoid this warning, just move wg.Add outside. --- client/snowflake.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/snowflake.go b/client/snowflake.go index bacc389..af9c2e4 100644 --- a/client/snowflake.go +++ b/client/snowflake.go @@ -56,8 +56,8 @@ func socksAcceptLoop(ln *pt.SocksListener, transport *sf.Transport, shutdown cha break } log.Printf("SOCKS accepted: %v", conn.Req) + wg.Add(1) go func() { - wg.Add(1) defer wg.Done() defer conn.Close()

1 0

[translation/tor-launcher-network-settings_completed] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings_completed
by translation＠torproject.org 14 Jun '21

14 Jun '21

commit 27bbd2c338af67b787b17f6d7471eb73b3a53633 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 14 10:18:26 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv-SE/network-settings.dtd | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd index 629c85011a..ab45e998a1 100644 --- a/sv-SE/network-settings.dtd +++ b/sv-SE/network-settings.dtd @@ -66,6 +66,9 @@ <!ENTITY torPreferences.torSettings "Tor-inställningar"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen." > <!ENTITY torPreferences.learnMore "Lär dig mer"> +<!ENTITY torPreferences.quickstart "Snabbstart"> +<!ENTITY torPreferences.quickstartDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen. Snabbstart gör att Tor Browser kan ansluta automatiskt."> +<!ENTITY torPreferences.quickstartCheckbox "Anslut alltid automatiskt"> <!ENTITY torPreferences.bridges "Broar"> <!ENTITY torPreferences.bridgesDescription "Broar hjälper dig att komma åt Tor-nätverket på platser där Tor är blockerat. Beroende på var du är, kan en bro fungera bättre än en annan."> <!ENTITY torPreferences.useBridge "Använd en bro">

1 0

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

14 Jun '21

commit 91136080fe8fae5743b1f529d83dae6c0aa9e1c5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 14 10:18:23 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- sv-SE/network-settings.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sv-SE/network-settings.dtd b/sv-SE/network-settings.dtd index 97bdb5a97d..ab45e998a1 100644 --- a/sv-SE/network-settings.dtd +++ b/sv-SE/network-settings.dtd @@ -66,9 +66,9 @@ <!ENTITY torPreferences.torSettings "Tor-inställningar"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen." > <!ENTITY torPreferences.learnMore "Lär dig mer"> -<!ENTITY torPreferences.quickstart "Quickstart"> -<!ENTITY torPreferences.quickstartDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world. Quickstart allows Tor Browser to connect automatically."> -<!ENTITY torPreferences.quickstartCheckbox "Always connect automatically"> +<!ENTITY torPreferences.quickstart "Snabbstart"> +<!ENTITY torPreferences.quickstartDescription "Tor Browser dirigerar din trafik över Tor-nätverket, som drivs av tusentals volontärer runt om i världen. Snabbstart gör att Tor Browser kan ansluta automatiskt."> +<!ENTITY torPreferences.quickstartCheckbox "Anslut alltid automatiskt"> <!ENTITY torPreferences.bridges "Broar"> <!ENTITY torPreferences.bridgesDescription "Broar hjälper dig att komma åt Tor-nätverket på platser där Tor är blockerat. Beroende på var du är, kan en bro fungera bättre än en annan."> <!ENTITY torPreferences.useBridge "Använd en bro">

1 0

[meek/turbotunnel-kcp] Comment typo.
by dcf＠torproject.org 14 Jun '21

14 Jun '21

commit 3e49af522f1b3216163eff9d6e4da7c2443952bd Author: David Fifield <david(a)bamsoftware.com> Date: Mon Jun 14 01:06:53 2021 -0600 Comment typo. --- common/encapsulation/encapsulation.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/encapsulation/encapsulation.go b/common/encapsulation/encapsulation.go index bfe9b5b..64a58d8 100644 --- a/common/encapsulation/encapsulation.go +++ b/common/encapsulation/encapsulation.go @@ -176,7 +176,7 @@ func WritePadding(w io.Writer, n int) (int, error) { return total, nil } -// MaxDataForSize returns the length of the longest slice that can pe passed to +// MaxDataForSize returns the length of the longest slice that can be passed to // WriteData, whose total encoded size (including length prefix) is no larger // than n. Call this to find out if a chunk of data will fit into a length // budget. Panics if n == 0.

1 0