October 2017 - tor-commits - lists.torproject.org

[tor/release-0.3.2] Merge branch 'bug23952_032' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 0d4addfc73c2647357aaaede54dbf936ff189b2e Merge: b1d6cf250 48ee85e0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 08:24:12 2017 -0400 Merge branch 'bug23952_032' into maint-0.3.2 changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit abbd6a36fc65378248548a1276f31dd1bb1a6906 Merge: f7707c903 0d4addfc7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 08:25:29 2017 -0400 Merge branch 'maint-0.3.2' changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-)

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 24 Oct '17

24 Oct '17

commit 86ab2c25de14dbe8f5154f7bc5a6749eec224fff Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 24 11:15:16 2017 +0000 Update translations for torcheck --- bn/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bn/torcheck.po b/bn/torcheck.po index 1279126c5..040b5d1e4 100644 --- a/bn/torcheck.po +++ b/bn/torcheck.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-09-19 19:57+0000\n" +"PO-Revision-Date: 2017-10-24 11:03+0000\n" "Last-Translator: Mahmud Numan <mahmudnuman(a)gmail.com>\n" "Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n" "MIME-Version: 1.0\n" @@ -74,7 +74,7 @@ msgid "Learn More »" msgstr "" msgid "Go" -msgstr "" +msgstr "যাওয়া" msgid "Short User Manual" msgstr ""

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 24 Oct '17

24 Oct '17

commit 71cb168a5de85de8f0d53320c284448dc3b003dd Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 24 10:47:49 2017 +0000 Update translations for torbutton-torbuttondtd --- bn/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn/torbutton.dtd b/bn/torbutton.dtd index 608947ce6..e2fa86fa2 100644 --- a/bn/torbutton.dtd +++ b/bn/torbutton.dtd @@ -46,7 +46,7 @@ <!ENTITY torbutton.prefs.sec_jit_slower_desc "Scripts on some sites may run slower."> <!ENTITY torbutton.prefs.sec_mathml_desc "Some mechanisms of displaying math equations are disabled."> <!ENTITY torbutton.prefs.sec_mathml_desc_tooltip "MathML is disabled."> -<!ENTITY torbutton.prefs.sec_medium "Medium"> +<!ENTITY torbutton.prefs.sec_medium "মধ্যম"> <!ENTITY torbutton.prefs.sec_all_jit_desc "On sites where JavaScript is enabled, performance optimizations are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_desc "Some font rendering features are disabled."> <!ENTITY torbutton.prefs.sec_font_rend_graphite_tooltip "The Graphite font rendering mechanism is disabled.">

1 0

[tor/maint-0.3.1] Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2 Merge: fcd5c3144 5bca66be4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:53:45 2017 -0400 Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d Merge: af33fdd7c 9ae4ffc07 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.3.0] Clear the address when node_get_prim_orport() returns early
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5bca66be497f18b94a85ad8eb836fff5a356627d Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 16:45:15 2017 -0400 Clear the address when node_get_prim_orport() returns early Fixes bug 23874; bugfix on 0.2.8.2-alpha. --- changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug23874 b/changes/bug23874 new file mode 100644 index 000000000..bf6620553 --- /dev/null +++ b/changes/bug23874 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory safety): + - Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 070e2e9e0..0e9a65181 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1031,6 +1031,14 @@ node_get_prim_orport(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. */ + RETURN_IPV4_AP(node->ri, or_port, ap_out); RETURN_IPV4_AP(node->rs, or_port, ap_out); /* Microdescriptors only have an IPv6 address */

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1 Merge: eac4c374e b1bd1bf19 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:55:08 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)

1 0

[tor/maint-0.3.1] Clear the address when node_get_prim_orport() returns early
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit 5bca66be497f18b94a85ad8eb836fff5a356627d Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 16:45:15 2017 -0400 Clear the address when node_get_prim_orport() returns early Fixes bug 23874; bugfix on 0.2.8.2-alpha. --- changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/changes/bug23874 b/changes/bug23874 new file mode 100644 index 000000000..bf6620553 --- /dev/null +++ b/changes/bug23874 @@ -0,0 +1,3 @@ + o Minor bugfixes (memory safety): + - Clear the address when node_get_prim_orport() returns early. + Fixes bug 23874; bugfix on 0.2.8.2-alpha. diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 070e2e9e0..0e9a65181 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -1031,6 +1031,14 @@ node_get_prim_orport(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. */ + RETURN_IPV4_AP(node->ri, or_port, ap_out); RETURN_IPV4_AP(node->rs, or_port, ap_out); /* Microdescriptors only have an IPv6 address */

1 0

[tor/maint-0.2.9] Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9
by nickm＠torproject.org 23 Oct '17

23 Oct '17

commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2 Merge: fcd5c3144 5bca66be4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 15:53:45 2017 -0400 Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9 changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+)

1 0