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

[tor/master] hs: Improve comments for when we change timestamps
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 1749e078914db58850d6dc932ceab78970ae8be6 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 14:24:36 2017 -0400 hs: Improve comments for when we change timestamps Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_client.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 77fbf548e..a02175929 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -1185,8 +1185,10 @@ hs_client_desc_has_arrived(const hs_ident_dir_conn_t *ident) log_info(LD_REND, "Descriptor has arrived. Launching circuits."); - /* Restart their timeout values, so they get a fair shake at connecting to - * the hidden service. XXX: Improve comment on why this is needed. */ + /* Because the connection can now proceed to opening circuit and + * ultimately connect to the service, reset those timestamp so the + * connection is considered "fresh" and can continue without being closed + * too early. */ base_conn->timestamp_created = now; base_conn->timestamp_lastread = now; base_conn->timestamp_lastwritten = now;

1 0

[tor/master] Merge remote-tracking branch 'catalyst-oniongit/bug23611'
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit e1d8a4bd720dd9941b467edb42ca64624743f51d Merge: c92ecac8b 87faed921 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 14:42:03 2017 -0400 Merge remote-tracking branch 'catalyst-oniongit/bug23611' changes/bug23611 | 4 ++++ doc/tor.1.txt | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-)

1 0

[tor/master] Remove wrong config parameter mention from manpage
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 87faed921ef37e78ed9b31c6f096c2f0bd5ffab6 Author: Taylor Yu <catalyst(a)torproject.org> Date: Thu Sep 21 13:31:54 2017 -0500 Remove wrong config parameter mention from manpage Don't refer to the obsolete (and misspelled) UseEntryGuardsAsDirectoryGuards config parameter in the manpage. --- changes/bug23611 | 4 ++++ doc/tor.1.txt | 9 ++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/changes/bug23611 b/changes/bug23611 new file mode 100644 index 000000000..f47e56200 --- /dev/null +++ b/changes/bug23611 @@ -0,0 +1,4 @@ + o Minor bugfixes (documentation): + - Fix manpage to not refer to the obsolete (and misspelled) + UseEntryGuardsAsDirectoryGuards parameter in the description of + NumDirectoryGuards. Fixes bug 23611; bugfix on 0.2.4.8-alpha. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 38c3fe42b..ba2bc13da 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1316,11 +1316,10 @@ The following options are useful only for clients (that is, if default to 1 if the consensus parameter isn't set. (Default: 0) [[NumDirectoryGuards]] **NumDirectoryGuards** __NUM__:: - If UseEntryGuardsAsDirectoryGuards is enabled, we try to make sure we have - at least NUM routers to use as directory guards. If this option is set to - 0, use the value from the guard-n-primary-dir-guards-to-use consensus - parameter, and default to 3 if the consensus parameter isn't set. - (Default: 0) + If UseEntryGuards is set to 1, we try to make sure we have at least NUM + routers to use as directory guards. If this option is set to 0, use the + value from the guard-n-primary-dir-guards-to-use consensus parameter, and + default to 3 if the consensus parameter isn't set. (Default: 0) [[GuardLifetime]] **GuardLifetime** __N__ **days**|**weeks**|**months**:: If nonzero, and UseEntryGuards is set, minimum time to keep a guard before

1 0

[tor/maint-0.3.1] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 7f3dc8327ac1f6b4a0ec377b5ec04e279b682cab Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..f2dc8bd1a --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 636b345b5..06f8a2c3a 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -254,7 +254,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: trn_cell_establish_intro_free(parsed_cell);

1 0

[tor/master] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 7f3dc8327ac1f6b4a0ec377b5ec04e279b682cab Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..f2dc8bd1a --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 636b345b5..06f8a2c3a 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -254,7 +254,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: trn_cell_establish_intro_free(parsed_cell);

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit c92ecac8bbac1d3bb1961f4210129011ce910c7d Merge: 6045bdd4a 7f3dc8327 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 14:39:17 2017 -0400 Merge branch 'maint-0.3.1' changes/bug23610 | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --cc changes/bug23610 index 3d868524e,f2dc8bd1a..20852a698 --- a/changes/bug23610 +++ b/changes/bug23610 @@@ -1,4 -1,4 +1,5 @@@ o Minor bugfixes (hidden service, relay): - Avoid a possible double close of a circuit by the intro point on error - of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610.; bugfix on - 0.3.2.1-alpha. + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. ++

1 0

[tor/release-0.3.1] hs: Avoid possible double circuit close on error
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit 7f3dc8327ac1f6b4a0ec377b5ec04e279b682cab Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Sep 21 13:13:44 2017 -0400 hs: Avoid possible double circuit close on error Fixes #23610 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/changes/bug23610 b/changes/bug23610 new file mode 100644 index 000000000..f2dc8bd1a --- /dev/null +++ b/changes/bug23610 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service, relay): + - Avoid a possible double close of a circuit by the intro point on error + of sending the INTRO_ESTABLISHED cell. Fixes ticket 23610; bugfix on + 0.3.0.1-alpha. diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 636b345b5..06f8a2c3a 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -254,7 +254,11 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request, goto done; err: - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + /* When sending the intro establish ack, on error the circuit can be marked + * as closed so avoid a double close. */ + if (!TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); + } done: trn_cell_establish_intro_free(parsed_cell);

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 21 Sep '17

21 Sep '17

commit e2ddc8b547847164f958938725f65ac491959e32 Merge: 5bf84b1f0 7f3dc8327 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 21 14:39:04 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23610 | 4 ++++ src/or/hs_intropoint.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)

1 0

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit 60f3695b0bf271eb63321759cfa85a365eaa2819 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 18:16:16 2017 +0000 Update translations for mat-gui_completed --- vi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi.po b/vi.po index dc01ddf78..db70b7e05 100644 --- a/vi.po +++ b/vi.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2017-09-19 17:03+0000\n" +"PO-Revision-Date: 2017-09-21 17:47+0000\n" "Last-Translator: Khanh Nguyen <nguyenduykhanh85(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 21 Sep '17

21 Sep '17

commit fa97f0ce556edd1d0a6dc95878f027ed0089abe2 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 21 18:16:11 2017 +0000 Update translations for mat-gui --- vi.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vi.po b/vi.po index dc01ddf78..db70b7e05 100644 --- a/vi.po +++ b/vi.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2017-09-19 17:03+0000\n" +"PO-Revision-Date: 2017-09-21 17:47+0000\n" "Last-Translator: Khanh Nguyen <nguyenduykhanh85(a)gmail.com>\n" "Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n" "MIME-Version: 1.0\n"

1 0