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

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 15 Mar '17

15 Mar '17

commit 78337cddda8c4a14fc02b3054dc91cfe955a5cec Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 15 18:15:29 2017 +0000 Update translations for https_everywhere_completed --- lt/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/ssl-observatory.dtd b/lt/ssl-observatory.dtd index d5ecadd..e7736c3 100644 --- a/lt/ssl-observatory.dtd +++ b/lt/ssl-observatory.dtd @@ -45,7 +45,7 @@ korporatyvinį tinklą:"> "Gaus ir išsiųs jūsų tinklo "autonominį sistemos numerį". Tai padės mums aptikti atakas nukreiptas prieš HTTPS ir nustatyti, ar mes turime duomenų apie tinklus iš tokių vietų kaip Iranas ar Sirija, kur atakos yra gana dažnos."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Įspėti, kai Observatorija aptiks jūsų naršyklės neaptiktą sertifikatą, kurio galiojimas panaikintas."> +"Įspėti, kai Observatorija aptiks jūsų naršyklės neaptiktą liudijimą, kurio galiojimas panaikintas."> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "Pateikti sertifikatai bus patikrinti Panaikintų Sertifikatų Sąraše. Deja, negalime garantuoti, kad bus nustatyti visi panaikinti sertifikatai, tačiau jei pamatysite įspėjimą, žinosite, kad tikriausiai kažkas yra negerai.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 15 Mar '17

15 Mar '17

commit 586434e39fdc858415389618178d9cbf3ade7e27 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 15 18:15:25 2017 +0000 Update translations for https_everywhere --- lt/ssl-observatory.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/ssl-observatory.dtd b/lt/ssl-observatory.dtd index d5ecadd..e7736c3 100644 --- a/lt/ssl-observatory.dtd +++ b/lt/ssl-observatory.dtd @@ -45,7 +45,7 @@ korporatyvinį tinklą:"> "Gaus ir išsiųs jūsų tinklo "autonominį sistemos numerį". Tai padės mums aptikti atakas nukreiptas prieš HTTPS ir nustatyti, ar mes turime duomenų apie tinklus iš tokių vietų kaip Iranas ar Sirija, kur atakos yra gana dažnos."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Įspėti, kai Observatorija aptiks jūsų naršyklės neaptiktą sertifikatą, kurio galiojimas panaikintas."> +"Įspėti, kai Observatorija aptiks jūsų naršyklės neaptiktą liudijimą, kurio galiojimas panaikintas."> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip "Pateikti sertifikatai bus patikrinti Panaikintų Sertifikatų Sąraše. Deja, negalime garantuoti, kad bus nustatyti visi panaikinti sertifikatai, tačiau jei pamatysite įspėjimą, žinosite, kad tikriausiai kažkas yra negerai.">

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 15 Mar '17

15 Mar '17

commit b4368ba9c93a472bb4b5fc0b0c06c3af88b3747c Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 15 18:15:08 2017 +0000 Update translations for bridgedb_completed --- lt/LC_MESSAGES/bridgedb.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index 2681260..88ccd96 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -5,7 +5,7 @@ # Translators: # Aiste G <aiste.gvildyte(a)gmail.com>, 2016 # Aiste G <aiste.gvildyte(a)gmail.com>, 2016 -# Moo, 2015-2016 +# Moo, 2015-2017 # Saule Papeckyte <saule.papeckyte(a)gmail.com>, 2015 # Edgaras7 <system(a)vippsystems.com>, 2014 # Tautvydas Zukauskas <lordmu(a)linuxmail.org>, 2016 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-11-25 10:27+0000\n" +"PO-Revision-Date: 2017-03-15 18:12+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgstr "Rodyti QR kodą" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR kodas jūsų tinklo tiltų linijoms" +msgstr "QR kodas jūsų tinklų tilto linijoms" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -85,18 +85,18 @@ msgstr "Įvyko klaida, gaunant jūsų QR kodą." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Šiame QR kode yra jūsų tinklo tiltų linijos. Nuskenuokite šį kodą, naudodami QR kodų skaitytuvą, kad nukopijuotumėte savo tinklo tiltų linijas į mobilųjį ar kitus įrenginius." +msgstr "Šiame QR kode yra jūsų tinklų tilto linijos. Nuskenuokite šį kodą, naudodami QR kodų skaitytuvą, kad nukopijuotumėte savo tinklų tilto linijas į mobilųjį ar kitus įrenginius." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Šiuo metu nėra prieinama jokių tinklo tiltų..." +msgstr "Šiuo metu nėra prieinami jokie tinklų tiltai..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "Galbūt jums reiktų pabandyti %s eiti atgal %s ir pasirinkti kitą tilto tipą!" +msgstr "Galbūt jums reikėtų pabandyti %s grįžti atgal %s ir pasirinkti kitą tinklų tilto tipą!" #: bridgedb/https/templates/index.html:11 #, python-format @@ -106,7 +106,7 @@ msgstr "%s1%s žingsnis " #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Parsisiųskite %s Tor Naršyklę %s" +msgstr "Atsisiųskite %s Tor Naršyklę %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -116,7 +116,7 @@ msgstr "%s2%s žingsnis " #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Gaukite %s tiltų %s" +msgstr "Gaukite %s tinklų tiltų %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -126,7 +126,7 @@ msgstr "%s3%s žingsnis " #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Dabar %s pridėkite tiltus į Tor Naršyklę %s" +msgstr "Dabar %s pridėkite tinklų tiltus į Tor Naršyklę %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -135,7 +135,7 @@ msgstr "Dabar %s pridėkite tiltus į Tor Naršyklę %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sT%siesiog duokite man tiltų!" +msgstr "%sT%siesiog suteikite man tinklų tiltus!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -163,7 +163,7 @@ msgstr "%sT%saip!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sG%sauti tinklo tiltus" +msgstr "%sG%sauti tinklų tiltus" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -171,7 +171,7 @@ msgstr "[Tai automatinis pranešimas; prašome į jį neatsakyti]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Štai jūsų tinklo tiltai:" +msgstr "Štai jūsų tinklų tiltai:" #: bridgedb/strings.py:47 #, python-format

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 15 Mar '17

15 Mar '17

commit ce344ec8dfe52145e3fa194b9dddb73a7c41e9da Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 15 18:15:04 2017 +0000 Update translations for bridgedb --- lt/LC_MESSAGES/bridgedb.po | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po index 2681260..88ccd96 100644 --- a/lt/LC_MESSAGES/bridgedb.po +++ b/lt/LC_MESSAGES/bridgedb.po @@ -5,7 +5,7 @@ # Translators: # Aiste G <aiste.gvildyte(a)gmail.com>, 2016 # Aiste G <aiste.gvildyte(a)gmail.com>, 2016 -# Moo, 2015-2016 +# Moo, 2015-2017 # Saule Papeckyte <saule.papeckyte(a)gmail.com>, 2015 # Edgaras7 <system(a)vippsystems.com>, 2014 # Tautvydas Zukauskas <lordmu(a)linuxmail.org>, 2016 @@ -15,7 +15,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-11-25 10:27+0000\n" +"PO-Revision-Date: 2017-03-15 18:12+0000\n" "Last-Translator: Moo\n" "Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n" "MIME-Version: 1.0\n" @@ -66,7 +66,7 @@ msgstr "Rodyti QR kodą" #: bridgedb/https/templates/bridges.html:52 msgid "QRCode for your bridge lines" -msgstr "QR kodas jūsų tinklo tiltų linijoms" +msgstr "QR kodas jūsų tinklų tilto linijoms" #. TRANSLATORS: Please translate this into some silly way to say #. "There was a problem!" in your language. For example, @@ -85,18 +85,18 @@ msgstr "Įvyko klaida, gaunant jūsų QR kodą." msgid "" "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" " your bridge lines onto mobile and other devices." -msgstr "Šiame QR kode yra jūsų tinklo tiltų linijos. Nuskenuokite šį kodą, naudodami QR kodų skaitytuvą, kad nukopijuotumėte savo tinklo tiltų linijas į mobilųjį ar kitus įrenginius." +msgstr "Šiame QR kode yra jūsų tinklų tilto linijos. Nuskenuokite šį kodą, naudodami QR kodų skaitytuvą, kad nukopijuotumėte savo tinklų tilto linijas į mobilųjį ar kitus įrenginius." #: bridgedb/https/templates/bridges.html:131 msgid "There currently aren't any bridges available..." -msgstr "Šiuo metu nėra prieinama jokių tinklo tiltų..." +msgstr "Šiuo metu nėra prieinami jokie tinklų tiltai..." #: bridgedb/https/templates/bridges.html:132 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " "type!" -msgstr "Galbūt jums reiktų pabandyti %s eiti atgal %s ir pasirinkti kitą tilto tipą!" +msgstr "Galbūt jums reikėtų pabandyti %s grįžti atgal %s ir pasirinkti kitą tinklų tilto tipą!" #: bridgedb/https/templates/index.html:11 #, python-format @@ -106,7 +106,7 @@ msgstr "%s1%s žingsnis " #: bridgedb/https/templates/index.html:13 #, python-format msgid "Download %s Tor Browser %s" -msgstr "Parsisiųskite %s Tor Naršyklę %s" +msgstr "Atsisiųskite %s Tor Naršyklę %s" #: bridgedb/https/templates/index.html:25 #, python-format @@ -116,7 +116,7 @@ msgstr "%s2%s žingsnis " #: bridgedb/https/templates/index.html:27 #, python-format msgid "Get %s bridges %s" -msgstr "Gaukite %s tiltų %s" +msgstr "Gaukite %s tinklų tiltų %s" #: bridgedb/https/templates/index.html:36 #, python-format @@ -126,7 +126,7 @@ msgstr "%s3%s žingsnis " #: bridgedb/https/templates/index.html:38 #, python-format msgid "Now %s add the bridges to Tor Browser %s" -msgstr "Dabar %s pridėkite tiltus į Tor Naršyklę %s" +msgstr "Dabar %s pridėkite tinklų tiltus į Tor Naršyklę %s" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! @@ -135,7 +135,7 @@ msgstr "Dabar %s pridėkite tiltus į Tor Naršyklę %s" #: bridgedb/https/templates/options.html:38 #, python-format msgid "%sJ%sust give me bridges!" -msgstr "%sT%siesiog duokite man tiltų!" +msgstr "%sT%siesiog suteikite man tinklų tiltus!" #: bridgedb/https/templates/options.html:51 msgid "Advanced Options" @@ -163,7 +163,7 @@ msgstr "%sT%saip!" #: bridgedb/https/templates/options.html:147 #, python-format msgid "%sG%set Bridges" -msgstr "%sG%sauti tinklo tiltus" +msgstr "%sG%sauti tinklų tiltus" #: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" @@ -171,7 +171,7 @@ msgstr "[Tai automatinis pranešimas; prašome į jį neatsakyti]" #: bridgedb/strings.py:45 msgid "Here are your bridges:" -msgstr "Štai jūsų tinklo tiltai:" +msgstr "Štai jūsų tinklų tiltai:" #: bridgedb/strings.py:47 #, python-format

1 0

[tor/master] Correctly handle fd-drain errors on windows workqueues
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 44514058b96440eaa1b364b915860ae372207ca6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:53:01 2017 -0400 Correctly handle fd-drain errors on windows workqueues Windows doesn't let you check the socket error for a socket with WSAGetLastError() and getsockopt(SO_ERROR). But getsockopt(SO_ERROR) clears the error on the socket, so you can't call it more than once per error. When we introduced recv_ni to help drain alert sockets, back in 0.2.6.3-alpha, we had the failure path for recv_ni call getsockopt() twice, though: once to check for EINTR and one to check for EAGAIN. Of course, we never got the eagain, so we treated it as an error, and warned about: "No error". The fix here is to have these functions return -errno on failure. Fixes bug 21540; bugfix on 0.2.6.3-alpha. --- changes/bug21540 | 4 +++ src/common/compat_threads.c | 68 ++++++++++++++++++++++++++++++--------------- src/common/workqueue.c | 5 ++-- 3 files changed, 52 insertions(+), 25 deletions(-) diff --git a/changes/bug21540 b/changes/bug21540 new file mode 100644 index 0000000..0cf684b --- /dev/null +++ b/changes/bug21540 @@ -0,0 +1,4 @@ + o Minor bugfixes (windows, relay): + - Resolve "Failure from drain_fd: No error" warnings on Windows + relays. Fixes bug 21540; bugfix on 0.2.6.3-alpha. + diff --git a/src/common/compat_threads.c b/src/common/compat_threads.c index f480906..a25d9a7 100644 --- a/src/common/compat_threads.c +++ b/src/common/compat_threads.c @@ -94,51 +94,73 @@ in_main_thread(void) } #if defined(HAVE_EVENTFD) || defined(HAVE_PIPE) -/* As write(), but retry on EINTR */ +/* As write(), but retry on EINTR, and return the negative error code on + * error. */ static int write_ni(int fd, const void *buf, size_t n) { int r; again: r = (int) write(fd, buf, n); - if (r < 0 && errno == EINTR) - goto again; + if (r < 0) { + if (errno == EINTR) + goto again; + else + return -errno; + } return r; } -/* As read(), but retry on EINTR */ +/* As read(), but retry on EINTR, and return the negative error code on error. + */ static int read_ni(int fd, void *buf, size_t n) { int r; again: r = (int) read(fd, buf, n); - if (r < 0 && errno == EINTR) - goto again; + if (r < 0) { + if (errno == EINTR) + goto again; + else + return -errno; + } return r; } #endif -/** As send(), but retry on EINTR. */ +/** As send(), but retry on EINTR, and return the negative error code on + * error. */ static int send_ni(int fd, const void *buf, size_t n, int flags) { int r; again: r = (int) send(fd, buf, n, flags); - if (r < 0 && ERRNO_IS_EINTR(tor_socket_errno(fd))) - goto again; + if (r < 0) { + int error = tor_socket_errno(fd); + if (ERRNO_IS_EINTR(error)) + goto again; + else + return -error; + } return r; } -/** As recv(), but retry on EINTR. */ +/** As recv(), but retry on EINTR, and return the negative error code on + * error. */ static int recv_ni(int fd, void *buf, size_t n, int flags) { int r; again: r = (int) recv(fd, buf, n, flags); - if (r < 0 && ERRNO_IS_EINTR(tor_socket_errno(fd))) - goto again; + if (r < 0) { + int error = tor_socket_errno(fd); + if (ERRNO_IS_EINTR(error)) + goto again; + else + return -error; + } return r; } @@ -149,7 +171,7 @@ eventfd_alert(int fd) { uint64_t u = 1; int r = write_ni(fd, (void*)&u, sizeof(u)); - if (r < 0 && errno != EAGAIN) + if (r < 0 && -r != EAGAIN) return -1; return 0; } @@ -160,8 +182,8 @@ eventfd_drain(int fd) { uint64_t u = 0; int r = read_ni(fd, (void*)&u, sizeof(u)); - if (r < 0 && errno != EAGAIN) - return -1; + if (r < 0 && -r != EAGAIN) + return r; return 0; } #endif @@ -172,8 +194,8 @@ static int pipe_alert(int fd) { ssize_t r = write_ni(fd, "x", 1); - if (r < 0 && errno != EAGAIN) - return -1; + if (r < 0 && -r != EAGAIN) + return r; return 0; } @@ -188,7 +210,7 @@ pipe_drain(int fd) r = read_ni(fd, buf, sizeof(buf)); } while (r > 0); if (r < 0 && errno != EAGAIN) - return -1; + return -errno; /* A value of r = 0 means EOF on the fd so successfully drained. */ return 0; } @@ -200,13 +222,13 @@ static int sock_alert(tor_socket_t fd) { ssize_t r = send_ni(fd, "x", 1, 0); - if (r < 0 && !ERRNO_IS_EAGAIN(tor_socket_errno(fd))) - return -1; + if (r < 0 && !ERRNO_IS_EAGAIN(-r)) + return r; return 0; } /** Drain all the input from a socket <b>fd</b>, and ignore it. Return 0 on - * success, -1 on error. */ + * success, -errno on error. */ static int sock_drain(tor_socket_t fd) { @@ -215,8 +237,8 @@ sock_drain(tor_socket_t fd) do { r = recv_ni(fd, buf, sizeof(buf), 0); } while (r > 0); - if (r < 0 && !ERRNO_IS_EAGAIN(tor_socket_errno(fd))) - return -1; + if (r < 0 && !ERRNO_IS_EAGAIN(-r)) + return r; /* A value of r = 0 means EOF on the fd so successfully drained. */ return 0; } diff --git a/src/common/workqueue.c b/src/common/workqueue.c index e1fb663..ec6e257 100644 --- a/src/common/workqueue.c +++ b/src/common/workqueue.c @@ -510,12 +510,13 @@ replyqueue_get_socket(replyqueue_t *rq) void replyqueue_process(replyqueue_t *queue) { - if (queue->alert.drain_fn(queue->alert.read_fd) < 0) { + int r = queue->alert.drain_fn(queue->alert.read_fd); + if (r < 0) { //LCOV_EXCL_START static ratelim_t warn_limit = RATELIM_INIT(7200); log_fn_ratelim(&warn_limit, LOG_WARN, LD_GENERAL, "Failure from drain_fd: %s", - tor_socket_strerror(tor_socket_errno(queue->alert.read_fd))); + tor_socket_strerror(-r)); //LCOV_EXCL_STOP }

1 0

[tor/master] Merge branch 'bug21540_029_v2'
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit c64adaaf90683f9c60cc90d3981ebf70cc87a6a7 Merge: 3b2d6da 4451405 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 12:17:15 2017 -0400 Merge branch 'bug21540_029_v2' changes/bug21540 | 4 +++ src/common/compat_threads.c | 68 ++++++++++++++++++++++++++++++--------------- src/common/workqueue.c | 5 ++-- 3 files changed, 52 insertions(+), 25 deletions(-)

1 0

[tor/master] Merge branch 'bug20059_024_v2' into maint-0.3.0
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 567a56ae2e59aef26b31829f300c5700c7923f7b Merge: 9281394 ec5fe41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:07:38 2017 -0400 Merge branch 'bug20059_024_v2' into maint-0.3.0 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Avoid a double-mark bug when makring a pending circuit as "too old"
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit ec5fe41209add4b216029466774a6b7e833210ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 09:19:00 2017 -0400 Avoid a double-mark bug when makring a pending circuit as "too old" Fixes bug 20059; bugfix on 0.1.0.1-rc. --- changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug20059 b/changes/bug20059 new file mode 100644 index 0000000..091fab0 --- /dev/null +++ b/changes/bug20059 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Avoid a double-marked-circuit warning that can happen when we receive + DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc. diff --git a/src/or/onion.c b/src/or/onion.c index 1a0bcf1..de4b6a5 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -184,7 +184,9 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) onion_queue_entry_remove(head); log_info(LD_CIRC, "Circuit create request is too old; canceling due to overload."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + if (! TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + } } return 0; }

1 0

[tor/master] Avoid a double-mark bug when makring a pending circuit as "too old"
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit ec5fe41209add4b216029466774a6b7e833210ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 09:19:00 2017 -0400 Avoid a double-mark bug when makring a pending circuit as "too old" Fixes bug 20059; bugfix on 0.1.0.1-rc. --- changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug20059 b/changes/bug20059 new file mode 100644 index 0000000..091fab0 --- /dev/null +++ b/changes/bug20059 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Avoid a double-marked-circuit warning that can happen when we receive + DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc. diff --git a/src/or/onion.c b/src/or/onion.c index 1a0bcf1..de4b6a5 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -184,7 +184,9 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) onion_queue_entry_remove(head); log_info(LD_CIRC, "Circuit create request is too old; canceling due to overload."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + if (! TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + } } return 0; }

1 0

[tor/maint-0.3.0] Merge branch 'bug20059_024_v2' into maint-0.3.0
by nickm＠torproject.org 15 Mar '17

15 Mar '17

commit 567a56ae2e59aef26b31829f300c5700c7923f7b Merge: 9281394 ec5fe41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 11:07:38 2017 -0400 Merge branch 'bug20059_024_v2' into maint-0.3.0 changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0