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

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug8062' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 01407f9718a7b1eb4e43b46c2799a390551aad29 Merge: dbdc994 fca578d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 16:33:47 2013 -0400 Merge remote-tracking branch 'public/bug8062' into maint-0.2.4 changes/bug8062 | 5 +++++ src/or/or.h | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)

1 0

[tor/master] Clear up a comment about when an assertion could fire
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 5d2b2b9ede6ea0f247b5505d7e30a622c312e9fe Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 19 16:23:58 2013 -0500 Clear up a comment about when an assertion could fire Resolves ticket 6164 --- src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index badacd6..49fee88 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2216,9 +2216,10 @@ routerstatus_format_entry(char *buf, size_t buf_len, return -1; } - /* This assert can fire for the control port, because + /* This assert could fire for the control port, because * it can request NS documents before all descriptors - * have been fetched. */ + * have been fetched. Therefore, we only do this test when + * format != NS_CONTROL_PORT. */ if (tor_memneq(desc->cache_info.signed_descriptor_digest, rs->descriptor_digest, DIGEST_LEN)) {

1 0

[tor/master] Merge remote-tracking branch 'public/bug6164' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit aa4fcc4f13ecc0959f26ac4c86a8e9b59d9c8783 Merge: 0b827cb 5d2b2b9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:45:49 2013 -0400 Merge remote-tracking branch 'public/bug6164' into maint-0.2.4 src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug7947' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit dbdc99483df6f0fdba9f7af8954719d47990a8b8 Merge: aa4fcc4 bd9901b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:56:55 2013 -0400 Merge branch 'bug7947' into maint-0.2.4 changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)

1 0

[tor/master] Handle TRUNCATE correctly if our next channel isn't done yet.
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit bd9901bef245b3880c9a60034b9fdf6d4829eb65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:55:55 2013 -0400 Handle TRUNCATE correctly if our next channel isn't done yet. Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1. --- changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/bug7947 b/changes/bug7947 new file mode 100644 index 0000000..6200ba2 --- /dev/null +++ b/changes/bug7947 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix the handling of a TRUNCATE cell when it arrives while the circuit + extension is in progress. Fixes bug 7947; bugfix on 0.0.7.1. + diff --git a/src/or/relay.c b/src/or/relay.c index 9ff9e1e..8e80d14 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1398,6 +1398,14 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'truncate' unsupported at origin. Dropping."); return 0; } + if (circ->n_hop) { + if (circ->n_chan) + log_warn(LD_BUG, "n_chan and n_hop set on the same circuit!"); + extend_info_free(circ->n_hop); + circ->n_hop = NULL; + tor_free(circ->n_chan_create_cell); + circuit_set_state(circ, CIRCUIT_STATE_OPEN); + } if (circ->n_chan) { uint8_t trunc_reason = get_uint8(cell->payload + RELAY_HEADER_SIZE); circuit_clear_cell_queue(circ, circ->n_chan);

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit d404b0200ff72a45d7c505a12f0ee98f89d28176 Merge: e5b79b5 aa4fcc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:46:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/or/dirserv.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit 899c2805b158e0e82ad6979a49b549793364c0d5 Merge: d404b02 dbdc994 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:57:51 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)

1 0

[tor/maint-0.2.4] Handle TRUNCATE correctly if our next channel isn't done yet.
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit bd9901bef245b3880c9a60034b9fdf6d4829eb65 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:55:55 2013 -0400 Handle TRUNCATE correctly if our next channel isn't done yet. Patch from 'cypherpunks'. Fixes bug #7947. Bugfix on 0.0.7.1. --- changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/changes/bug7947 b/changes/bug7947 new file mode 100644 index 0000000..6200ba2 --- /dev/null +++ b/changes/bug7947 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Fix the handling of a TRUNCATE cell when it arrives while the circuit + extension is in progress. Fixes bug 7947; bugfix on 0.0.7.1. + diff --git a/src/or/relay.c b/src/or/relay.c index 9ff9e1e..8e80d14 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1398,6 +1398,14 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'truncate' unsupported at origin. Dropping."); return 0; } + if (circ->n_hop) { + if (circ->n_chan) + log_warn(LD_BUG, "n_chan and n_hop set on the same circuit!"); + extend_info_free(circ->n_hop); + circ->n_hop = NULL; + tor_free(circ->n_chan_create_cell); + circuit_set_state(circ, CIRCUIT_STATE_OPEN); + } if (circ->n_chan) { uint8_t trunc_reason = get_uint8(cell->payload + RELAY_HEADER_SIZE); circuit_clear_cell_queue(circ, circ->n_chan);

1 0

[tor/maint-0.2.4] Merge branch 'bug7947' into maint-0.2.4
by nickm＠torproject.org 18 Mar '13

18 Mar '13

commit dbdc99483df6f0fdba9f7af8954719d47990a8b8 Merge: aa4fcc4 bd9901b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 18 15:56:55 2013 -0400 Merge branch 'bug7947' into maint-0.2.4 changes/bug7947 | 4 ++++ src/or/relay.c | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 18 Mar '13

18 Mar '13

commit 7c6d13cfb9c8e6973436b6596f90a996b520fb1d Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 18 19:46:04 2013 +0000 Update translations for https_everywhere_completed --- fi/https-everywhere.properties | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/fi/https-everywhere.properties b/fi/https-everywhere.properties index f8fba33..2a03cbe 100644 --- a/fi/https-everywhere.properties +++ b/fi/https-everywhere.properties @@ -3,3 +3,4 @@ https-everywhere.menu.globalDisable = Poista HTTPS Everywhere käytöstä https-everywhere.menu.enableDisable = Ota sääntöjä käyttöön / poista käytöstä https-everywhere.menu.noRules = (Tälle sivulle ei ole sääntöjä) https-everywhere.menu.unknownRules = (Sivun sääntöä ei tunnistettu) +https-everywhere.toolbar.hint = HTTPS Everywhere on käytössä. Voit valita, millä sivustoilla ohjelmaa käytetään, kun napsautat osoiterivissä olevaa kuvaketta.

1 0