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

[tor/master] Merge branch 'tor-gitlab/mr/331' into maint-0.4.5
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit d382f26914590623954ad2f20f1cc06a3733e6a8 Merge: 690c7be253 b599f489ae Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Mar 10 10:06:44 2021 -0500 Merge branch 'tor-gitlab/mr/331' into maint-0.4.5 changes/bug40256_045 | 3 +++ doc/man/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'tor-gitlab/mr/331'
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit 6fce18916f8a58ad129c98710b44ae40928806cc Merge: fc080b4113 b599f489ae Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Mar 10 10:06:20 2021 -0500 Merge branch 'tor-gitlab/mr/331' changes/bug40256_045 | 3 +++ doc/man/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Fix documentation formatting for VirtualAddrNetworkIPv6
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit b599f489ae3a1ec8e4f0742243c41dc15f040930 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 8 11:15:37 2021 -0500 Fix documentation formatting for VirtualAddrNetworkIPv6 Fixes bug #40256; bugfix on 0.2.9.4-alpha. --- changes/bug40256_045 | 3 +++ doc/man/tor.1.txt | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/changes/bug40256_045 b/changes/bug40256_045 new file mode 100644 index 0000000000..14e67659e0 --- /dev/null +++ b/changes/bug40256_045 @@ -0,0 +1,3 @@ + o Minor bugfixes (documentation): + - Fix a formatting error on the documentation for + VirtualAddrNetworkIPv6. Fixes bug 40256; bugfix on 0.2.9.4-alpha. diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt index 58774e555f..b57c6ec70a 100644 --- a/doc/man/tor.1.txt +++ b/doc/man/tor.1.txt @@ -1797,8 +1797,9 @@ The following options are useful only for clients (that is, if The default **VirtualAddrNetwork** address ranges on a properly configured machine will route to the loopback or link-local interface. The maximum number of bits for the network prefix is set to 104 - for IPv6 and 16 for IPv4. However, a wider network - smaller prefix length - - is preferable since it reduces the chances for an attacker to guess the + for IPv6 and 16 for IPv4. However, a larger network + (that is, one with a smaller prefix length) + is preferable, since it reduces the chances for an attacker to guess the used IP. For local use, no change to the default VirtualAddrNetwork setting is needed.

1 0

[tor/maint-0.4.5] Fix parsing bug in linux get_total_system_memory().
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit 690c7be2537dc30be2d1f4978af7df77c46c2782 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 3 14:52:15 2021 -0500 Fix parsing bug in linux get_total_system_memory(). Use find_str_at_start_of_line(), not strstr() here: we don't want to match "MemTotal: " if it appears in the middle of a line. Fixes #40315; bugfix on 0.2.5.4-alpha. --- changes/bug40315 | 5 +++++ src/lib/meminfo/.may_include | 1 + src/lib/meminfo/meminfo.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug40315 b/changes/bug40315 new file mode 100644 index 0000000000..9e9c740d96 --- /dev/null +++ b/changes/bug40315 @@ -0,0 +1,5 @@ + o Minor bugfixes (Linux, relay): + - Fix a bug in determining total available system memory that would have + been triggered if the format of /proc/meminfo had ever changed + to include "MemTotal:" in the middle of a line. Fixes bug 40315; + bugfix on 0.2.5.4-alpha. diff --git a/src/lib/meminfo/.may_include b/src/lib/meminfo/.may_include index 9e4d25fd6a..12fe36d134 100644 --- a/src/lib/meminfo/.may_include +++ b/src/lib/meminfo/.may_include @@ -5,4 +5,5 @@ lib/fs/*.h lib/log/*.h lib/malloc/*.h lib/meminfo/*.h +lib/string/*.h lib/testsupport/*.h diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index b7d991e410..77da579f99 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -17,6 +17,7 @@ #include "lib/fs/files.h" #include "lib/log/log.h" #include "lib/malloc/malloc.h" +#include "lib/string/util_string.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -65,7 +66,7 @@ get_total_system_memory_impl(void) s = read_file_to_str_until_eof(fd, 65536, &file_size); if (!s) goto err; - cp = strstr(s, "MemTotal:"); + cp = find_str_at_start_of_line(s, "MemTotal:"); if (!cp) goto err; /* Use the system sscanf so that space will match a wider number of space */

1 0

[tor/master] Fix parsing bug in linux get_total_system_memory().
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit 690c7be2537dc30be2d1f4978af7df77c46c2782 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 3 14:52:15 2021 -0500 Fix parsing bug in linux get_total_system_memory(). Use find_str_at_start_of_line(), not strstr() here: we don't want to match "MemTotal: " if it appears in the middle of a line. Fixes #40315; bugfix on 0.2.5.4-alpha. --- changes/bug40315 | 5 +++++ src/lib/meminfo/.may_include | 1 + src/lib/meminfo/meminfo.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug40315 b/changes/bug40315 new file mode 100644 index 0000000000..9e9c740d96 --- /dev/null +++ b/changes/bug40315 @@ -0,0 +1,5 @@ + o Minor bugfixes (Linux, relay): + - Fix a bug in determining total available system memory that would have + been triggered if the format of /proc/meminfo had ever changed + to include "MemTotal:" in the middle of a line. Fixes bug 40315; + bugfix on 0.2.5.4-alpha. diff --git a/src/lib/meminfo/.may_include b/src/lib/meminfo/.may_include index 9e4d25fd6a..12fe36d134 100644 --- a/src/lib/meminfo/.may_include +++ b/src/lib/meminfo/.may_include @@ -5,4 +5,5 @@ lib/fs/*.h lib/log/*.h lib/malloc/*.h lib/meminfo/*.h +lib/string/*.h lib/testsupport/*.h diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index b7d991e410..77da579f99 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -17,6 +17,7 @@ #include "lib/fs/files.h" #include "lib/log/log.h" #include "lib/malloc/malloc.h" +#include "lib/string/util_string.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -65,7 +66,7 @@ get_total_system_memory_impl(void) s = read_file_to_str_until_eof(fd, 65536, &file_size); if (!s) goto err; - cp = strstr(s, "MemTotal:"); + cp = find_str_at_start_of_line(s, "MemTotal:"); if (!cp) goto err; /* Use the system sscanf so that space will match a wider number of space */

1 0

[tor/release-0.4.5] Fix parsing bug in linux get_total_system_memory().
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit 690c7be2537dc30be2d1f4978af7df77c46c2782 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 3 14:52:15 2021 -0500 Fix parsing bug in linux get_total_system_memory(). Use find_str_at_start_of_line(), not strstr() here: we don't want to match "MemTotal: " if it appears in the middle of a line. Fixes #40315; bugfix on 0.2.5.4-alpha. --- changes/bug40315 | 5 +++++ src/lib/meminfo/.may_include | 1 + src/lib/meminfo/meminfo.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/changes/bug40315 b/changes/bug40315 new file mode 100644 index 0000000000..9e9c740d96 --- /dev/null +++ b/changes/bug40315 @@ -0,0 +1,5 @@ + o Minor bugfixes (Linux, relay): + - Fix a bug in determining total available system memory that would have + been triggered if the format of /proc/meminfo had ever changed + to include "MemTotal:" in the middle of a line. Fixes bug 40315; + bugfix on 0.2.5.4-alpha. diff --git a/src/lib/meminfo/.may_include b/src/lib/meminfo/.may_include index 9e4d25fd6a..12fe36d134 100644 --- a/src/lib/meminfo/.may_include +++ b/src/lib/meminfo/.may_include @@ -5,4 +5,5 @@ lib/fs/*.h lib/log/*.h lib/malloc/*.h lib/meminfo/*.h +lib/string/*.h lib/testsupport/*.h diff --git a/src/lib/meminfo/meminfo.c b/src/lib/meminfo/meminfo.c index b7d991e410..77da579f99 100644 --- a/src/lib/meminfo/meminfo.c +++ b/src/lib/meminfo/meminfo.c @@ -17,6 +17,7 @@ #include "lib/fs/files.h" #include "lib/log/log.h" #include "lib/malloc/malloc.h" +#include "lib/string/util_string.h" #ifdef HAVE_FCNTL_H #include <fcntl.h> @@ -65,7 +66,7 @@ get_total_system_memory_impl(void) s = read_file_to_str_until_eof(fd, 65536, &file_size); if (!s) goto err; - cp = strstr(s, "MemTotal:"); + cp = find_str_at_start_of_line(s, "MemTotal:"); if (!cp) goto err; /* Use the system sscanf so that space will match a wider number of space */

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit c1b43d79eb35a33e149ea43d9f431cc8afdcef4c Merge: fa06aaf7d7 690c7be253 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Mar 10 10:04:26 2021 -0500 Merge branch 'maint-0.4.5' into release-0.4.5 changes/bug40315 | 5 +++++ src/lib/meminfo/.may_include | 1 + src/lib/meminfo/meminfo.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.4.5'
by dgoulet＠torproject.org 10 Mar '21

10 Mar '21

commit fc080b4113c769bd75b81ef4ba571c8df96f5a7b Merge: 05564a8521 690c7be253 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Mar 10 10:04:26 2021 -0500 Merge branch 'maint-0.4.5' changes/bug40315 | 5 +++++ src/lib/meminfo/.may_include | 1 + src/lib/meminfo/meminfo.c | 3 ++- 3 files changed, 8 insertions(+), 1 deletion(-)

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 10 Mar '21

10 Mar '21

commit c7dfeb72cd4f56bd77f68c61a17756dc0f11ed8d Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 10 10:48:18 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- es-ES/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es-ES/network-settings.dtd b/es-ES/network-settings.dtd index cb8b72ca55..5950dcaa2c 100644 --- a/es-ES/network-settings.dtd +++ b/es-ES/network-settings.dtd @@ -5,7 +5,7 @@  <!ENTITY torlauncher.localePicker.title "Idioma del Tor Browser"> -<!ENTITY torlauncher.localePicker.prompt "Por favor, seleccione un idioma."> +<!ENTITY torlauncher.localePicker.prompt "Elige un idioma.">  @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> <!ENTITY torsettings.proxyHelpTitle "Ayuda con el Proxy"> -<!ENTITY torsettings.proxyHelp1 "Es posible que se necesite un proxy local al conectarse a través de una red de una empresa, escuela o universidad. Si no estás seguro de si se necesita o no un proxy, consulta la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema."> +<!ENTITY torsettings.proxyHelp1 "Podrías necesitar un proxy local si te conectas a través de una red de empresa, escuela o universidad. Si no estás seguro de si se necesita o no un proxy, consulta la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema."> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> <!ENTITY torsettings.bridgeHelp1 "Los puentes son transmisores no listados que dificultan el bloqueo de las conexiones a la red Tor.  Cada tipo de puente utiliza un método diferente para evitar la censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los modestos hacen que tu tráfico parezca que se está conectando a ese servicio en lugar de a Tor.">

1 0

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

10 Mar '21

commit aa1cf63a7e01c8e7b0711515e8a481e6b8300731 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 10 10:48:16 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- es-ES/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/es-ES/network-settings.dtd b/es-ES/network-settings.dtd index cb8b72ca55..5950dcaa2c 100644 --- a/es-ES/network-settings.dtd +++ b/es-ES/network-settings.dtd @@ -5,7 +5,7 @@  <!ENTITY torlauncher.localePicker.title "Idioma del Tor Browser"> -<!ENTITY torlauncher.localePicker.prompt "Por favor, seleccione un idioma."> +<!ENTITY torlauncher.localePicker.prompt "Elige un idioma.">  @@ -52,7 +52,7 @@ <!ENTITY torsettings.copyLog "Copiar el registro de mensajes(log) de Tor al portapapeles"> <!ENTITY torsettings.proxyHelpTitle "Ayuda con el Proxy"> -<!ENTITY torsettings.proxyHelp1 "Es posible que se necesite un proxy local al conectarse a través de una red de una empresa, escuela o universidad. Si no estás seguro de si se necesita o no un proxy, consulta la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema."> +<!ENTITY torsettings.proxyHelp1 "Podrías necesitar un proxy local si te conectas a través de una red de empresa, escuela o universidad. Si no estás seguro de si se necesita o no un proxy, consulta la configuración de Internet en otro navegador o comprueba la configuración de red de tu sistema."> <!ENTITY torsettings.bridgeHelpTitle "Ayuda de repetidores puente ('bridge relays')"> <!ENTITY torsettings.bridgeHelp1 "Los puentes son transmisores no listados que dificultan el bloqueo de las conexiones a la red Tor.  Cada tipo de puente utiliza un método diferente para evitar la censura.  Los obfs hacen que tu tráfico parezca ruido aleatorio, y los modestos hacen que tu tráfico parezca que se está conectando a ese servicio en lugar de a Tor.">

1 0