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

[tor/release-0.2.8] Merge branch 'maint-0.2.8' into release-0.2.8
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 7df4f23d952f892c09f5ef930e9e4f297f784cce Merge: caa16bf d78711c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:20:19 2016 -0400 Merge branch 'maint-0.2.8' into release-0.2.8 changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.8] When clearing cells from a circuit for OOM reasons, tell cmux we did so.
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit e4aaf7666028c30866ad63053ad9f6eb6bf16bf7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 21 19:01:12 2016 -0400 When clearing cells from a circuit for OOM reasons, tell cmux we did so. Not telling the cmux would sometimes cause an assertion failure in relay.c when we tried to get an active circuit and found an "active" circuit with no cells. Additionally, replace that assert with a test and a log message. Fix for bug 20203. This is actually probably a bugfix on 0.2.8.1-alpha, specifically my code in 8b4e5b7ee902fb7fa0776 where I made circuit_mark_for_close_() do less in order to simplify our call graph. Thanks to "cypherpunks" for help diagnosing. --- changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/changes/bug20203 b/changes/bug20203 new file mode 100644 index 0000000..b4809ff --- /dev/null +++ b/changes/bug20203 @@ -0,0 +1,6 @@ + o Major bugfixes (relay, OOM handler) + - Fix a timing-dependent assertion failure that could occur when we + tried to flush from a circuit after having freed its cells because + of an out-of-memory condition. Fixes bug 20203; bugfix on + 0.2.8.1-alpha. Thanks to "cypherpunks" for help diagnosing this + one. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 716024d..5fb8be5 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1836,8 +1836,14 @@ marked_circuit_free_cells(circuit_t *circ) return; } cell_queue_clear(&circ->n_chan_cells); - if (! CIRCUIT_IS_ORIGIN(circ)) - cell_queue_clear(& TO_OR_CIRCUIT(circ)->p_chan_cells); + if (circ->n_mux) + circuitmux_clear_num_cells(circ->n_mux, circ); + if (! CIRCUIT_IS_ORIGIN(circ)) { + or_circuit_t *orcirc = TO_OR_CIRCUIT(circ); + cell_queue_clear(&orcirc->p_chan_cells); + if (orcirc->p_mux) + circuitmux_clear_num_cells(orcirc->p_mux, circ); + } } static size_t diff --git a/src/or/relay.c b/src/or/relay.c index eddad6a..33191e1 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2619,6 +2619,15 @@ channel_flush_from_first_active_circuit, (channel_t *chan, int max)) } /* Circuitmux told us this was active, so it should have cells */ + if (/*BUG(*/ queue->n == 0 /*)*/) { + log_warn(LD_BUG, "Found a supposedly active circuit with no cells " + "to send. Trying to recover."); + circuitmux_set_num_cells(cmux, circ, 0); + if (! circ->marked_for_close) + circuit_mark_for_close(circ, END_CIRC_REASON_INTERNAL); + continue; + } + tor_assert(queue->n > 0); /*

1 0

[tor/maint-0.2.8] Merge branch 'bug20203_027_squashed' into maint-0.2.8
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit 6e96eababe8f05ac03b2e83911e6fae5654884b4 Merge: 1edea87 e4aaf76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:17:00 2016 -0400 Merge branch 'bug20203_027_squashed' into maint-0.2.8 changes/bug20203 | 6 ++++++ src/or/circuitlist.c | 10 ++++++++-- src/or/relay.c | 9 +++++++++ 3 files changed, 23 insertions(+), 2 deletions(-)

1 0

[tor/maint-0.2.8] LintChanges fix
by nickm＠torproject.org 22 Sep '16

22 Sep '16

commit d78711c0ae83c505a966791a18a6b8d5b7e4a8d1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 22 15:19:59 2016 -0400 LintChanges fix --- changes/bug20203 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug20203 b/changes/bug20203 index b4809ff..711c91b 100644 --- a/changes/bug20203 +++ b/changes/bug20203 @@ -1,4 +1,4 @@ - o Major bugfixes (relay, OOM handler) + o Major bugfixes (relay, OOM handler): - Fix a timing-dependent assertion failure that could occur when we tried to flush from a circuit after having freed its cells because of an out-of-memory condition. Fixes bug 20203; bugfix on

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit 497f65042b2a60c3181e801a320a2aa569e72885 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 19:18:10 2016 +0000 Update translations for tor-messenger-prefsdtd --- ar/prefs.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ar/prefs.dtd b/ar/prefs.dtd index 05e2d03..3c9883b 100644 --- a/ar/prefs.dtd +++ b/ar/prefs.dtd @@ -16,7 +16,7 @@ <!ENTITY prefs.coniksConnection "الاتصال"> <!ENTITY prefs.coniksServerAddress "عنوان الخادم"> <!ENTITY prefs.coniksServerPort "منفذ"> -<!ENTITY prefs.coniksAccountPolicy "Account Policy"> -<!ENTITY prefs.coniksPoliciesForAccount "Policies for account:"> +<!ENTITY prefs.coniksAccountPolicy "سياسة الحساب"> +<!ENTITY prefs.coniksPoliciesForAccount "سياسات للحساب:"> <!ENTITY prefs.coniksPrivateLookups "Private lookups"> <!ENTITY prefs.coniksSignedKeyChange "Signed key change"> \ No newline at end of file

1 0

[translation/tor-messenger-ircproperties] Update translations for tor-messenger-ircproperties
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit de091ddc3cfcf0a394b89d00c0e8a9066afc1825 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 19:17:54 2016 +0000 Update translations for tor-messenger-ircproperties --- ar/irc.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/irc.properties b/ar/irc.properties index e2648dd..ae1af92 100644 --- a/ar/irc.properties +++ b/ar/irc.properties @@ -28,7 +28,7 @@ joinChat.password=_Password options.server=خادم options.port=بوابة options.ssl=استعمل SSL -options.encoding=Character Set +options.encoding=مجموعة الأحرف options.quitMessage=إنهي الرسالة options.partMessage=جزء الرسالة options.showServerTab=اعرض الرسائل من الخادم @@ -166,7 +166,7 @@ error.channelFull=القناة %S متلئه error.inviteOnly=You must be invited to join %S. error.nonUniqueTarget=%S is not a unique user@host or shortname or you have tried to join too many channels at once. error.notChannelOp=لَسْت مُشَغّل قَناة في S% -error.notChannelOwner=You are not a channel owner of %S. +error.notChannelOwner=لست صاحب القناة %S. error.wrongKey=Cannot join %S, invalid channel password. error.sendMessageFailed=An error occurred while sending your last message. Please try again once the connection has been reestablished. # %1$S is the channel the user tried to join, %2$S is the channel @@ -187,7 +187,7 @@ tooltip.server=متصل ب # protect users). tooltip.connectedFrom=متصل من tooltip.registered=مسجل -tooltip.registeredAs=Registered as +tooltip.registeredAs=مسجل باسم tooltip.secure=استخدام اتصال آمن # The away message of the user tooltip.away=بعيد

1 0

[translation/tor-messenger-conversationsproperties] Update translations for tor-messenger-conversationsproperties
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit fa33a07c9d6d54c4ed2d88d829edb61b1e58d5fd Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 19:17:34 2016 +0000 Update translations for tor-messenger-conversationsproperties --- ar/conversations.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ar/conversations.properties b/ar/conversations.properties index 649725d..1c17fcc 100644 --- a/ar/conversations.properties +++ b/ar/conversations.properties @@ -10,18 +10,18 @@ targetChanged=المحادثه مع %1$S ستستكمل عن طريق %2$S. # LOCALIZATION NOTE (statusChanged): # %1$S is the display name of the contact. # %2$S is the new status type (a value from status.properties). -statusChanged=%1$S is now %2$S. +statusChanged=%1$S هو الآن %2$S. # LOCALIZATION NOTE (statusChangedWithStatusText): # %1$S is the display name of the contact. # %2$S is the new status type (a value from status.properties). # %3$S is the status text (eg. "I'm currently away from the computer"). -statusChangedWithStatusText=%1$S is now %2$S: %3$S. +statusChangedWithStatusText=%1$S هو الآن %2$S: %3$S. # LOCALIZATION NOTE (statusChangedFromUnknown[WithStatusText]): # special case of the previous 2 strings for when the status was # previously unknown. These 2 strings should not mislead the user # into thinking the person's status has just changed. -statusChangedFromUnknown=%1$S is %2$S. -statusChangedFromUnknownWithStatusText=%1$S is %2$S: %3$S. +statusChangedFromUnknown=%1$S هو %2$S. +statusChangedFromUnknownWithStatusText=%1$S هو %2$S: %3$S. # LOCALIZATION NOTE (statusKnown[WithStatusText]): # special case of the previous 2 strings for when an account has just # been reconnected, so the status is now known. These 2 strings should not

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit 6db4fe2074c53ea4796c0eb34c42e34500960171 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 19:15:27 2016 +0000 Update translations for liveusb-creator --- ar/ar.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 1eefae3..5107c6e 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -15,13 +15,14 @@ # Sherief Alaa <sheriefalaa.w(a)gmail.com>, 2013 # taljurf <taljurf(a)fedoraproject.org>, 2009 # Yassmin Alkhatib <yaso95(a)gmail.com>, 2015 +# محيي الدين <tx99h4(a)hotmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-11-02 21:23+0100\n" -"PO-Revision-Date: 2016-03-21 16:31+0000\n" -"Last-Translator: Yassmin Alkhatib <yaso95(a)gmail.com>\n" +"PO-Revision-Date: 2016-09-22 18:58+0000\n" +"Last-Translator: محيي الدين <tx99h4(a)hotmail.com>\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -81,7 +82,7 @@ msgid "" "<li>The encrypted persistent storage of the Tails USB stick that you are currently using is not copied.</li>\n" "\n" "</ul>" -msgstr "" +msgstr "<ul>\n<li>ثبِّت Tails في ذاكرة USB أخرى عبر نسخ نظام Tails الذي تستخدمه حاليا..</li>\n<li>إن ذاكرة USB التي تثبت فيها النظام جرت تهيئها وعليه فإن كل البيانات التي بداخلها فُقدت.</li>\n<li>إن التخزين الثابت المُعمَّى لذاكرة USB لنظام Tails المستخدم حاليا لم يُستنسَخ.</li>\n</ul>" #: ../liveusb/launcher_ui.py:157 msgid ""

1 0

[translation/tails-onioncircuits] Update translations for tails-onioncircuits
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit 6ff73a45274a68d87046f90e06c4785df92cee8f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 18:48:40 2016 +0000 Update translations for tails-onioncircuits --- ar/onioncircuits.pot | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ar/onioncircuits.pot b/ar/onioncircuits.pot index c170fcc..0a8ea5c 100644 --- a/ar/onioncircuits.pot +++ b/ar/onioncircuits.pot @@ -5,13 +5,14 @@ # Translators: # Ahmed Alhammadi <6622227a(a)gmail.com>, 2016 # crash x <xmr.crashx(a)gmail.com>, 2016 +# Singapore Goldindor, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-05-31 14:42+0200\n" -"PO-Revision-Date: 2016-09-14 10:52+0000\n" -"Last-Translator: crash x <xmr.crashx(a)gmail.com>\n" +"PO-Revision-Date: 2016-09-22 18:28+0000\n" +"Last-Translator: Singapore Goldindor\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -25,11 +26,11 @@ msgstr "أنت لم ترتبط بتور بعد.." #: ../onioncircuits:95 msgid "Onion Circuits" -msgstr "" +msgstr "دائرة اونيون" #: ../onioncircuits:125 msgid "Circuit" -msgstr "" +msgstr "دائرة" #: ../onioncircuits:126 msgid "Status"

1 0

[translation/tails-openpgp-applet] Update translations for tails-openpgp-applet
by translation＠torproject.org 22 Sep '16

22 Sep '16

commit a3e8bf5c141e2bf50b67375778f1555827385b65 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Sep 22 18:48:29 2016 +0000 Update translations for tails-openpgp-applet --- ar/openpgp-applet.pot | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ar/openpgp-applet.pot b/ar/openpgp-applet.pot index 4518ba8..0de9b2a 100644 --- a/ar/openpgp-applet.pot +++ b/ar/openpgp-applet.pot @@ -4,13 +4,14 @@ # # Translators: # ouss <oussjarrouse(a)gmail.com>, 2016 +# Singapore Goldindor, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: tails(a)boum.org\n" "POT-Creation-Date: 2015-08-10 15:55+0200\n" -"PO-Revision-Date: 2016-03-21 16:27+0000\n" -"Last-Translator: ouss <oussjarrouse(a)gmail.com>\n" +"PO-Revision-Date: 2016-09-22 18:43+0000\n" +"Last-Translator: Singapore Goldindor\n" "Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -52,7 +53,7 @@ msgstr "إدارة المفاتيح" #: bin/openpgp-applet:251 msgid "_Open Text Editor" -msgstr "" +msgstr "_فتح محرر النص" #: bin/openpgp-applet:295 msgid "The clipboard does not contain valid input data."

1 0