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

[tor/master] Merge branch 'dgoulet_ticket23709_033_01_squashed'
by nickm＠torproject.org 08 Dec '17

08 Dec '17

commit 44010c6fc11608b13924372a179825946672cb23 Merge: bb7c5b431 50124fd7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 8 14:44:09 2017 -0500 Merge branch 'dgoulet_ticket23709_033_01_squashed' changes/ticket23709 | 11 + src/or/channel.c | 1598 ++++------------------------------------ src/or/channel.h | 91 +-- src/or/channeltls.c | 13 +- src/or/circuitbuild.c | 3 +- src/or/circuitlist.c | 3 +- src/or/connection_or.c | 3 - src/or/relay.c | 129 +--- src/test/fakechans.h | 1 - src/test/test_channel.c | 1797 ++++++++++++++++++--------------------------- src/test/test_relay.c | 4 - src/test/test_scheduler.c | 12 - 12 files changed, 906 insertions(+), 2759 deletions(-)

1 0

[tor/master] chan: Add changes file for ticket 23709
by nickm＠torproject.org 08 Dec '17

08 Dec '17

commit 50124fd7a643deaa9a4072b2e54278226baaf5b0 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Dec 8 11:40:16 2017 -0500 chan: Add changes file for ticket 23709 Closes #23709 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/ticket23709 | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/changes/ticket23709 b/changes/ticket23709 new file mode 100644 index 000000000..7948f9ae0 --- /dev/null +++ b/changes/ticket23709 @@ -0,0 +1,11 @@ + o Major feature (channel): + - Remove the incoming and outgoing channel queues. The reason to do so was + due to the fact that they were always empty meaning never used but still + looked at in our fast path. Bottom line, it was an unused code path. + - We've simplify a lot the channel subsystem by removing those queues but + also by removing a lot of unused code or dead code around it. Overall + this is a cleanup removing more than 1500 lines of code overall and + adding very little except for unit test. + - The majority ot the channel unit tests have been rewritten and the code + coverage has now been raised to 83.6% for channel.c. + Closes ticket 23709.

1 0

[tor/master] test: Make older GCC happy and thus our oniongit pipeline
by nickm＠torproject.org 08 Dec '17

08 Dec '17

commit e96c577ed25b02155757737e20ef6e4577a44493 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Dec 7 16:00:18 2017 -0500 test: Make older GCC happy and thus our oniongit pipeline Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_channel.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/test/test_channel.c b/src/test/test_channel.c index c3b99d87a..38b69a9ad 100644 --- a/src/test/test_channel.c +++ b/src/test/test_channel.c @@ -1421,7 +1421,8 @@ test_channel_for_extend(void *arg) channel_clear_client(chan1); /* Non matching ed identity with valid digest. */ - ed25519_public_key_t dumb_ed_id = {0}; + ed25519_public_key_t dumb_ed_id; + memset(&dumb_ed_id, 0, sizeof(dumb_ed_id)); ret_chan = channel_get_for_extend(digest, &dumb_ed_id, &addr, &msg, &launch); tt_assert(!ret_chan);

1 0

[tor/master] Move a comment to relay_send_end_cell_from_edge()
by nickm＠torproject.org 08 Dec '17

08 Dec '17

commit bb7c5b431d12808c8cfda0cf9029bc1c0b2d12c6 Author: teor <teor2345(a)gmail.com> Date: Fri Dec 8 12:49:33 2017 +1100 Move a comment to relay_send_end_cell_from_edge() It looks like it was left behind in a refactor. Fixes 24559. --- src/or/connection_edge.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 41f0fe6a1..113568bb7 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -339,6 +339,10 @@ relay_send_end_cell_from_edge(streamid_t stream_id, circuit_t *circ, payload[0] = (char) reason; + /* Note: we have to use relay_send_command_from_edge here, not + * connection_edge_end or connection_edge_send_command, since those require + * that we have a stream connected to a circuit, and we don't connect to a + * circuit until we have a pending/successful resolve. */ return relay_send_command_from_edge(stream_id, circ, RELAY_COMMAND_END, payload, 1, cpath_layer); } @@ -3405,11 +3409,6 @@ connection_exit_begin_conn(cell_t *cell, circuit_t *circ) if (rh.length > RELAY_PAYLOAD_SIZE) return -END_CIRC_REASON_TORPROTOCOL; - /* Note: we have to use relay_send_command_from_edge here, not - * connection_edge_end or connection_edge_send_command, since those require - * that we have a stream connected to a circuit, and we don't connect to a - * circuit until we have a pending/successful resolve. */ - if (!server_mode(options) && circ->purpose != CIRCUIT_PURPOSE_S_REND_JOINED) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

1 0

[torspec/master] Update the list of current torspec editors.
by isis＠torproject.org 08 Dec '17

08 Dec '17

commit f0e54aab3a6213a2e7515af27f44fe8e6ef396d2 Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 20 18:43:53 2017 +0000 Update the list of current torspec editors. --- proposals/001-process.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/proposals/001-process.txt b/proposals/001-process.txt index 1da80da..d6717bf 100644 --- a/proposals/001-process.txt +++ b/proposals/001-process.txt @@ -75,9 +75,8 @@ How new proposals get added: To get your proposal in, send it to the tor-dev mailing list. - The current proposal editors are Nick Mathewson, Jacob Appelbaum, George - Kadianakis, Damian Johnson, Isis Lovecruft, and David - Goulet. + The current proposal editors are Nick Mathewson, George Kadianakis, + Damian Johnson, Isis Lovecruft, and David Goulet. What should go in a proposal:

1 0

[torspec/master] Require a "Ticket:" field for future proposals in certain states.
by isis＠torproject.org 08 Dec '17

08 Dec '17

commit 8be6722e8d901304f6795fcf97c02c0f45bca98e Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Nov 20 18:27:47 2017 +0000 Require a "Ticket:" field for future proposals in certain states. New proposals in states {OPEN,ACCEPTED,CLOSED,FINISHED} must have a "Ticket:" field which may either be a ticket number or a publicly accessible URL. When the ticket is just a number, it should be in reference to Tor's canonical bug tracker. This information greatly helps both new contributors and relay operators who are interested in the implementation status of a working proposal. This patch permits the "Ticket:" field to be added to older proposals (<= prop#288), but it does not require it. --- proposals/001-process.txt | 12 ++++++++++-- proposals/reindex.py | 30 +++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/proposals/001-process.txt b/proposals/001-process.txt index ba65211..1da80da 100644 --- a/proposals/001-process.txt +++ b/proposals/001-process.txt @@ -85,11 +85,19 @@ What should go in a proposal: Filename, Title, Author, Created, Status. These fields are optional but recommended: - Target, Implemented-In. + Target, Implemented-In, Ticket**. + The Target field should describe which version the proposal is hoped to be implemented in (if it's Open or Accepted). The Implemented-In field should describe which version the proposal was implemented in (if it's - Finished or Closed). + Finished or Closed). The Ticket field should be a ticket number referring + to Tor's canonical bug tracker (e.g. "#7144" refers to + https://bugs.torproject.org/7144) or to a publicly accessible URI where one + may subscribe to updates and/or retrieve information on implementation + status. + + ** Proposals with assigned numbers of prop#283 and higher are REQUIRED to + have a Ticket field if the Status is OPEN, ACCEPTED, CLOSED, or FINISHED. The body of the proposal should start with an Overview section explaining what the proposal's about, what it does, and about what state it's in. diff --git a/proposals/reindex.py b/proposals/reindex.py index b442271..990016f 100755 --- a/proposals/reindex.py +++ b/proposals/reindex.py @@ -5,11 +5,11 @@ class Error(Exception): pass STATUSES = """DRAFT NEEDS-REVISION NEEDS-RESEARCH OPEN ACCEPTED META FINISHED CLOSED SUPERSEDED DEAD REJECTED OBSOLETE RESERVE INFORMATIONAL""".split() -REQUIRED_FIELDS = [ "Filename", "Status", "Title" ] -CONDITIONAL_FIELDS = { "OPEN" : [ "Target" ], - "ACCEPTED" : [ "Target "], - "CLOSED" : [ "Implemented-In" ], - "FINISHED" : [ "Implemented-In" ] } +REQUIRED_FIELDS = [ "Filename", "Status", "Title"] +CONDITIONAL_FIELDS = { "OPEN" : [ "Target", "Ticket" ], + "ACCEPTED" : [ "Target", "Ticket" ], + "CLOSED" : [ "Implemented-In", "Ticket" ], + "FINISHED" : [ "Implemented-In", "Ticket" ] } FNAME_RE = re.compile(r'^(\d\d\d)-.*[^\~]$') DIR = "." OUTFILE = "000-index.txt" @@ -45,9 +45,29 @@ def readProposal(fn): finally: f.close() +def getProposalNumber(fn): + """Get the proposal's assigned number from its filename `fn`.""" + parts = fn.split('-', 1) + + assert len(parts) == 2, \ + "Filename must have a proposal number and title separated by a '-'" + + return int(parts[0]) + def checkProposal(fn, fields): status = fields.get("Status") need_fields = REQUIRED_FIELDS + CONDITIONAL_FIELDS.get(status, []) + + number = getProposalNumber(fn) + # Since prop#288 was the newest when we began requiring the 'Ticket:' + # field, we don't require the field for it or any older proposal. + # (Although you're encouraged to add it to your proposal, and add it for + # older proposals where you know the correct ticket, as it greatly helps + # newcomers find more information on the implementation.) + if number <= 288: + if "Ticket" in need_fields: + need_fields.remove("Ticket") + for f in need_fields: if not fields.has_key(f): raise Error("%s has no %s field"%(fn, f))

1 0

[translation/whisperback_completed] Update translations for whisperback_completed
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 2f2d6858e0c3bd15fcf36c80d91c868334ee471f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 22:45:30 2017 +0000 Update translations for whisperback_completed --- cs/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/cs.po b/cs/cs.po index f1db63a31..fe60a51f2 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-12-07 22:13+0000\n" +"PO-Revision-Date: 2017-12-07 22:17+0000\n" "Last-Translator: Mikulas Holy\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/whisperback] Update translations for whisperback
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 0e28905c37b377dc6149865feb21f2add6256306 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 22:45:25 2017 +0000 Update translations for whisperback --- cs/cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs/cs.po b/cs/cs.po index f1db63a31..fe60a51f2 100644 --- a/cs/cs.po +++ b/cs/cs.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-03-20 12:09+0000\n" -"PO-Revision-Date: 2017-12-07 22:13+0000\n" +"PO-Revision-Date: 2017-12-07 22:17+0000\n" "Last-Translator: Mikulas Holy\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit 5b00865ac8f4008e81bb20fa45e5246b67d28359 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 22:17:16 2017 +0000 Update translations for tails-misc_completed --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index fdd695144..122ab2e1e 100644 --- a/cs.po +++ b/cs.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-11-17 12:05+0000\n" +"PO-Revision-Date: 2017-12-07 22:10+0000\n" "Last-Translator: Michal Vašíček <michalvasicek(a)icloud.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 07 Dec '17

07 Dec '17

commit e0b0f72b1bc4e6f33f6d3a7e446164400dbdf907 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Dec 7 22:17:11 2017 +0000 Update translations for tails-misc --- cs.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cs.po b/cs.po index fdd695144..122ab2e1e 100644 --- a/cs.po +++ b/cs.po @@ -18,7 +18,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-11-17 12:05+0000\n" +"PO-Revision-Date: 2017-12-07 22:10+0000\n" "Last-Translator: Michal Vašíček <michalvasicek(a)icloud.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n"

1 0