April 2018 - tor-commits - lists.torproject.org

[tor/master] Fix a pointer size error in test_bridges.c
by nickm＠torproject.org 18 Apr '18

18 Apr '18

commit 3bf9974b6c4ee9f2a8204c058e1b7c206b99d620 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 19:44:09 2018 -0400 Fix a pointer size error in test_bridges.c sizeof(ret) is the size of the pointer, not the size of what it points to. Fortunately, we already have a function to compare tor_addr_port_t values for equality. Bugfix on c2c5b13e5d8a77e; bug not in any released Tor. Found by clang's scan-build. --- src/test/test_bridges.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index b5bd27e09..c4a4cacd9 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -234,7 +234,7 @@ test_bridges_get_configured_bridge_by_orports_digest(void *arg) ret = get_configured_bridge_by_orports_digest(digest, orports); tt_ptr_op(ret, OP_NE, NULL); - tt_mem_op(addrport1, OP_EQ, bridge_get_addr_port(ret), sizeof(ret)); + tt_assert(tor_addr_port_eq(addrport1, bridge_get_addr_port(ret))); done: smartlist_free(orports);

1 0

[tor/master] Fix a copy-and-paste error from 6be994fa717cf73
by nickm＠torproject.org 18 Apr '18

18 Apr '18

commit d67d3dd1456edf20e79bd1ba105536bdcdbfc4dc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 19:39:50 2018 -0400 Fix a copy-and-paste error from 6be994fa717cf73 Found by clang's scan-build too. Bug not in any released Tor. --- src/or/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/config.c b/src/or/config.c index 206274cd3..9c0b321b5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2190,7 +2190,7 @@ options_act(const or_options_t *old_options) if (options->BandwidthRate != old_options->BandwidthRate || options->BandwidthBurst != old_options->BandwidthBurst || - options->BandwidthRate != old_options->BandwidthRate || + options->RelayBandwidthRate != old_options->RelayBandwidthRate || options->RelayBandwidthBurst != old_options->RelayBandwidthBurst) connection_bucket_adjust(options);

1 0

[tor/master] Add a redundant memset to node_get_pref_ipv6_orport()
by nickm＠torproject.org 18 Apr '18

18 Apr '18

commit 31a450a5b69a88fd9f38b1ca043952009ffddbf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 19:41:10 2018 -0400 Add a redundant memset to node_get_pref_ipv6_orport() For whatever reason, clang's scan-build isn't sure that this function actually initializes its output. --- src/or/nodelist.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 71eee3fa2..81a5c944a 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1517,6 +1517,7 @@ node_get_pref_ipv6_orport(const node_t *node, tor_addr_port_t *ap_out) { node_assert_ok(node); tor_assert(ap_out); + memset(ap_out, 0, sizeof(*ap_out)); /* Check ri first, because rewrite_node_address_for_bridge() updates * node->ri with the configured bridge address.

1 0

[tor/master] Add an initialization case to node_get_prim_dirport
by nickm＠torproject.org 18 Apr '18

18 Apr '18

commit 1abe0a5769f3fe7c2a36975acd8ab1e861925f51 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 17 19:41:51 2018 -0400 Add an initialization case to node_get_prim_dirport Fixes a bug found by scan-build; bugfix on c2fa743806acc. Bug not in any released Tor. --- src/or/nodelist.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 81a5c944a..bbcfb6cff 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1583,6 +1583,11 @@ node_get_prim_dirport(const node_t *node, tor_addr_port_t *ap_out) node_assert_ok(node); tor_assert(ap_out); + /* Clear the address, as a safety precaution if calling functions ignore the + * return value */ + tor_addr_make_null(&ap_out->addr, AF_INET); + ap_out->port = 0; + /* Check ri first, because rewrite_node_address_for_bridge() updates * node->ri with the configured bridge address. */

1 0

[user-manual/master] Fixing image
by colin＠torproject.org 18 Apr '18

18 Apr '18

commit ea459133509ec40b50a0fa926890e9bf428e8f5c Author: Colin Childs <colin(a)torproject.org> Date: Tue Apr 17 18:26:18 2018 -0500 Fixing image --- C/media/circumvention/configure.png | Bin 221675 -> 245540 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/C/media/circumvention/configure.png b/C/media/circumvention/configure.png index 7cebfab..8dad78e 100644 Binary files a/C/media/circumvention/configure.png and b/C/media/circumvention/configure.png differ

1 0

[snowflake/master] Only unset the header for the page being rendered
by arlo＠torproject.org 17 Apr '18

17 Apr '18

commit 433a47fdf7c272493b2183e63a7d0ee811a0b12c Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Apr 17 16:43:01 2018 -0400 Only unset the header for the page being rendered --- proxy/static/.htaccess | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess index ab8cfab..f733194 100644 --- a/proxy/static/.htaccess +++ b/proxy/static/.htaccess @@ -1,3 +1,3 @@ -<FilesMatch "embed\.html|snowflake\.js|modernizr\.js|koch\.jpg"> +<Files "embed.html"> Header always unset X-Frame-Options -</FilesMatch> +</Files>

1 0

[snowflake/master] Add an .htaccess file to unset X-Frame-Options
by arlo＠torproject.org 17 Apr '18

17 Apr '18

commit b441ae4bf4ecefd26c976a903f95de3346477737 Author: Arlo Breault <arlolra(a)gmail.com> Date: Tue Apr 17 16:05:39 2018 -0400 Add an .htaccess file to unset X-Frame-Options --- proxy/static/.htaccess | 3 +++ 1 file changed, 3 insertions(+) diff --git a/proxy/static/.htaccess b/proxy/static/.htaccess new file mode 100644 index 0000000..ab8cfab --- /dev/null +++ b/proxy/static/.htaccess @@ -0,0 +1,3 @@ +<FilesMatch "embed\.html|snowflake\.js|modernizr\.js|koch\.jpg"> + Header always unset X-Frame-Options +</FilesMatch>

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 17 Apr '18

17 Apr '18

commit 6a1595f88f17b45b9f29fa95aa585b11131c1d26 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 19:45:31 2018 +0000 Update translations for https_everywhere --- hi/https-everywhere.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hi/https-everywhere.properties b/hi/https-everywhere.properties index 5d905b8c7..6d39078ed 100644 --- a/hi/https-everywhere.properties +++ b/hi/https-everywhere.properties @@ -1,5 +1,5 @@ -https-everywhere.menu.globalEnable = हर जगह HTTPS सक्षम -https-everywhere.menu.globalDisable = हर जगह HTTPS अक्षम +https-everywhere.menu.globalEnable = हर जगह HTTPS लागु करें +https-everywhere.menu.globalDisable = हर जगह HTTPS निष्क्रिय करें https-everywhere.menu.enableDisable = Enable / Disable Rules https-everywhere.menu.noRules = (No Rules for This Page) https-everywhere.menu.unknownRules = (Rules for This Page Unknown)

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 17 Apr '18

17 Apr '18

commit 78b628b1764905dbf4df4caf7bf4ccc901e33c3a Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 18:46:52 2018 +0000 Update translations for abouttor-homepage_completed --- es/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 6354df745..2f54c734e 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÁS, este navegador tampoco está actualizado."> -<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y luego selecciona Comprobar actualizaciones del Navegador Tor."> +<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y selecciona Comprobar actualizaciones del Navegador Tor."> <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 17 Apr '18

17 Apr '18

commit f93aadb5ec6d046a778523617fabc73c5f9452b1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Apr 17 18:46:46 2018 +0000 Update translations for abouttor-homepage --- es/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es/aboutTor.dtd b/es/aboutTor.dtd index 6354df745..2f54c734e 100644 --- a/es/aboutTor.dtd +++ b/es/aboutTor.dtd @@ -8,7 +8,7 @@ <!ENTITY aboutTor.outOfDateTorOn.label "ADVERTENCIA: Este navegador no está actualizado."> <!ENTITY aboutTor.outOfDateTorOff.label "ADEMÁS, este navegador tampoco está actualizado."> -<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y luego selecciona Comprobar actualizaciones del Navegador Tor."> +<!ENTITY aboutTor.outOfDate2.label "Haz clic en la cebolla y selecciona Comprobar actualizaciones del Navegador Tor."> <!ENTITY aboutTor.check.label "Probar las preferencias de red Tor">

1 0