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

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Feb '17

08 Feb '17

commit b1ab6de835ab89453e79269d79eba5816fc0498e Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 12:18:20 2017 +0000 Update translations for tor-browser-manual --- vi/vi.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index b3a5a6f..03946b9 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -1264,10 +1264,10 @@ msgid "" "Issues</link> page to see if the problem you are experiencing is already " "listed there." msgstr "" -"Trình duyệt Tor đang trong quá trình phát triển đều đặn, và một vài vấn đề " -"đã được biết đến nhưng vẫn chưa được khắc phục. Hãy kiểm tra trang <link " -"xref=\"known-issues\">Các vấn đề đã biết</link> để xem nếu vấn đề bạn đang " -"gặp phải đã được liệt kê ở đó rồi." +"Trình duyệt Tor đang trong quá trình phát triển đều đặn, và một vài sự cố đã" +" được biết đến nhưng vẫn chưa được khắc phục. Hãy kiểm tra trang <link xref" +"=\"known-issues\">Các sự cố đã biết</link> để xem nếu vấn đề bạn đang trải " +"nghiệm đã được liệt kê ở đó rồi." #: uninstalling.page:6 msgid "How to remove Tor Browser from your system"

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Feb '17

08 Feb '17

commit b6f9906dc0d6ff08e922ddac0370ab3b36675f43 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 11:48:20 2017 +0000 Update translations for tor-browser-manual --- vi/vi.po | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/vi/vi.po b/vi/vi.po index 5a6ea87..b3a5a6f 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -1255,7 +1255,7 @@ msgstr "" #: troubleshooting.page:74 msgid "Known issues" -msgstr "" +msgstr "Các vấn đề đã biết" #: troubleshooting.page:75 msgid "" @@ -1264,14 +1264,18 @@ msgid "" "Issues</link> page to see if the problem you are experiencing is already " "listed there." msgstr "" +"Trình duyệt Tor đang trong quá trình phát triển đều đặn, và một vài vấn đề " +"đã được biết đến nhưng vẫn chưa được khắc phục. Hãy kiểm tra trang <link " +"xref=\"known-issues\">Các vấn đề đã biết</link> để xem nếu vấn đề bạn đang " +"gặp phải đã được liệt kê ở đó rồi." #: uninstalling.page:6 msgid "How to remove Tor Browser from your system" -msgstr "" +msgstr "Làm thế nào để gỡ bỏ Trình duyệt Tor khỏi hệ thống" #: uninstalling.page:10 msgid "Uninstalling" -msgstr "" +msgstr "Huỷ cài đặt" #: uninstalling.page:12 msgid ""

1 0

[translation/tor-browser-manual] Update translations for tor-browser-manual
by translation＠torproject.org 08 Feb '17

08 Feb '17

commit a22045dbfc3cade4c58d15fa2bd761f54d285854 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 8 09:49:59 2017 +0000 Update translations for tor-browser-manual --- vi/vi.po | 3 +++ 1 file changed, 3 insertions(+) diff --git a/vi/vi.po b/vi/vi.po index c3319e8..5a6ea87 100644 --- a/vi/vi.po +++ b/vi/vi.po @@ -1279,6 +1279,9 @@ msgid "" " computer. Uninstalling Tor Browser will not affect your system’s software " "or settings." msgstr "" +"Trình duyệt Tor không tác động đến bất cứ phần mền hay các cài đặt nào đang " +"tồn tại trên máy tính của bạn. Việc huỷ cài đặt Trình duyệt Tor sẽ không tác" +" động đến phần mềm hay các cài đặt hệ thống." #: uninstalling.page:18 msgid "Removing Tor Browser from your system is simple:"

1 0

[webwml/master] Revert "Drop broken TorBrowser link"
by arma＠torproject.org 08 Feb '17

08 Feb '17

commit 6f83149ceea0fa621529d403c1d1390c2fc257a5 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 7 21:18:08 2017 -0500 Revert "Drop broken TorBrowser link" This reverts commit dfca2029f35e01297434d5ba288f89cc312948f2. --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index dd41a85..e276865 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -399,7 +399,7 @@ meetings around the world.</li> </p> <a id="project-torbrowser"></a> - <h3>Tor Browser (<a + <h3><a href="<page projects/torbrowser>">Tor Browser</a> (<a href="https://gitweb.torproject.org/tor-browser.git">code</a>, <a href="https://trac.torproject.org/projects/tor/query?status=accepted&status=assig…">bug tracker</a>, <a href="https://www.torproject.org/projects/torbrowser/design/">design doc</a>)</h3>

1 0

[webwml/master] fix a very subtle html breakage
by arma＠torproject.org 08 Feb '17

08 Feb '17

commit 5bb684790a110fdaad4731cd03382c1d024f91e4 Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Feb 7 21:16:51 2017 -0500 fix a very subtle html breakage introduced in commit d886c1470 this breakage was also the reason why commit dfca2029 happened (which i'll revert next). --- getinvolved/en/volunteer.wml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 75ef8c2..dd41a85 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -374,7 +374,7 @@ meetings around the world.</li> <td>None</td> <td>arma, nickm</td> </tr> - </table + </table> <sub> * Project is still in an alpha state.

1 0

[tor/release-0.2.7] Merge branch 'maint-0.2.5' into maint-0.2.6
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit f2a30413a35bb360323a98fb124fbc629245978d Merge: 5446cb8 2ce4330 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 10:37:53 2017 -0500 Merge branch 'maint-0.2.5' into maint-0.2.6 changes/bug16248 | 8 ++++++++ changes/bug18710 | 6 ++++++ src/or/dnsserv.c | 4 +--- src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 66 insertions(+), 7 deletions(-)

1 0

[tor/release-0.2.8] Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 85a2487f9704cfeff0255c5f660d977ec9c30cff Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 09:49:23 2017 -0500 Disable a log_backtrace (which 0.2.4 does not have) in 16248 fix --- src/or/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/main.c b/src/or/main.c index 89e5a51..9e78ea0 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -539,7 +539,7 @@ connection_check_event(connection_t *conn, struct event *ev) conn->marked_for_close_file ? conn->marked_for_close_file : "-", conn->marked_for_close ); - log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); + //log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); return -1; } return 0;

1 0

[tor/release-0.2.8] Merge branch 'maint-0.2.4' into maint-0.2.5
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit c056d19323e499a0003ba9de0db2bdee9c301872 Merge: b9ef21c 85a2487 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 7 10:37:31 2017 -0500 Merge branch 'maint-0.2.4' into maint-0.2.5 changes/bug16248 | 8 ++++++++ src/or/main.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 59 insertions(+), 4 deletions(-) diff --cc src/or/main.c index 031f758,9e78ea0..31fbdcd --- a/src/or/main.c +++ b/src/or/main.c @@@ -524,9 -506,48 +524,48 @@@ connection_is_reading(connection_t *con (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); } + /** Check whether <b>conn</b> is correct in having (or not having) a + * read/write event (passed in <b>ev</b). On success, return 0. On failure, + * log a warning and return -1. */ + static int + connection_check_event(connection_t *conn, struct event *ev) + { + int bad; + + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + /* DNS requests which we launch through the dnsserv.c module do not have + * any underlying socket or any underlying linked connection, so they + * shouldn't have any attached events either. + */ + bad = ev != NULL; + } else { + /* Everytyhing else should have an underlying socket, or a linked + * connection (which is also tracked with a read_event/write_event pair). + */ + bad = ev == NULL; + } + + if (bad) { + log_warn(LD_BUG, "Event missing on connection %p [%s;%s]. " + "socket=%d. linked=%d. " + "is_dns_request=%d. Marked_for_close=%s:%d", + conn, + conn_type_to_string(conn->type), + conn_state_to_string(conn->type, conn->state), + (int)conn->s, (int)conn->linked, + (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request), + conn->marked_for_close_file ? conn->marked_for_close_file : "-", + conn->marked_for_close + ); + //log_backtrace(LOG_WARN, LD_BUG, "Backtrace attached."); + return -1; + } + return 0; + } + /** Tell the main loop to stop notifying <b>conn</b> of any read events. */ -void -connection_stop_reading(connection_t *conn) +MOCK_IMPL(void, +connection_stop_reading,(connection_t *conn)) { tor_assert(conn);

1 0

[tor/release-0.2.8] Add comments to connection_check_event().
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit cfeb1db2fb881db85a11d80e70a1a14c62b46950 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 14 12:53:21 2016 -0400 Add comments to connection_check_event(). --- src/or/main.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index 1200b55..89e5a51 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -506,14 +506,24 @@ connection_is_reading(connection_t *conn) (conn->read_event && event_pending(conn->read_event, EV_READ, NULL)); } +/** Check whether <b>conn</b> is correct in having (or not having) a + * read/write event (passed in <b>ev</b). On success, return 0. On failure, + * log a warning and return -1. */ static int connection_check_event(connection_t *conn, struct event *ev) { int bad; if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + /* DNS requests which we launch through the dnsserv.c module do not have + * any underlying socket or any underlying linked connection, so they + * shouldn't have any attached events either. + */ bad = ev != NULL; } else { + /* Everytyhing else should have an underlying socket, or a linked + * connection (which is also tracked with a read_event/write_event pair). + */ bad = ev == NULL; }

1 0

[tor/release-0.2.8] If we start/stop reading on a dnsserv connection, don't assert.
by nickm＠torproject.org 07 Feb '17

07 Feb '17

commit 650c03127a877eb0de1cfad8afa5cb3d8474a956 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Mar 11 10:33:19 2016 -0500 If we start/stop reading on a dnsserv connection, don't assert. Fixes bug 16248. Patch from cypherpunks. Bugfix on 0.2.0.1-alpha. --- src/or/main.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/or/main.c b/src/or/main.c index bd23141..a2b032d 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -517,6 +517,12 @@ connection_stop_reading(connection_t *conn) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) { @@ -542,6 +548,12 @@ connection_start_reading(connection_t *conn) return; }); + /* if dummy conn then no socket and no event, nothing to do here */ + if (conn->type == CONN_TYPE_AP && TO_EDGE_CONN(conn)->is_dns_request) { + tor_assert(!conn->read_event); + return; + } + tor_assert(conn->read_event); if (conn->linked) {

1 0