August 2020 - tor-commits - lists.torproject.org

[translation/communitytpo-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-contentspot
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 7229af7f398a280f69c91655d8dc403cfa5f0562 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 20:45:12 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+es.po | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index d9b7dbca8d..6df45cdf93 100644 --- a/contents+es.po +++ b/contents+es.po @@ -8,8 +8,8 @@ # David Figuera <dfb(a)fastmail.com>, 2020 # Emma Peel, 2020 # vareli <ehespinosa(a)ya.com>, 2020 -# Fred Shen <niclored(a)hotmail.com>, 2020 # Zuhualime Akoochimoya, 2020 +# Fred Shen <niclored(a)hotmail.com>, 2020 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-11 12:15+CET\n" "PO-Revision-Date: 2019-12-11 10:50+0000\n" -"Last-Translator: Zuhualime Akoochimoya, 2020\n" +"Last-Translator: Fred Shen <niclored(a)hotmail.com>, 2020\n" "Language-Team: Spanish (https://www.transifex.com/otf/teams/1519/es/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8297,7 +8297,7 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) msgid "* Sixth, teach your university's lawyers about Tor." -msgstr "" +msgstr "* Sexto, enseña a los abogados de tu universidad sobre Tor." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -8306,6 +8306,9 @@ msgid "" "Tor from you, in a relaxed environment, than to hear about it from a " "stranger over the phone." msgstr "" +"Esto puede verse como una jugada peligrosa, pero es la mejor para ellos " +"escuchar sobre Tor de tu parte. en un ambiente relajado, que escucharlo de " +"un extraño en el teléfono." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body) @@ -8316,6 +8319,12 @@ msgid "" "/community-resources/eff-tor-legal-faq/) comes in, along with your law " "school contacts if you found any)." msgstr "" +"Recuerda que los abogados no les gusta que les digan como interpretar las " +"leyes por gente por fuera de la abogacía, pero muchas veces les complace " +"escuchar que otros abogados an hecho una investigación profunda u trabajo de" +" campo (aquí es donde [el EFF's preguntas legales más frecuentes](/relay" +"/community-resources/eff-tor-legal-faq/) entra, junto con tus contactos de " +"en tu universidad de derecho si as encontrado alguno)." #: https//community.torproject.org/relay/community-resources/tor-relay-universities/ #: (content/relay-operations/community-resources/tor-relay-universities/contents+en.lrpage.body)

1 0

[snowflake-webext/master] bump version to 0.4.1
by cohosh＠torproject.org 13 Aug '20

13 Aug '20

commit 14db9a23002b982c465e96edee814e83736e6447 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Aug 13 16:29:55 2020 -0400 bump version to 0.4.1 --- package.json | 4 ++-- translation | 2 +- webext/manifest.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 601675a..432bdf4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "snowflake-pt", - "version": "0.4.0", + "version": "0.4.1", "description": "Snowflake is a WebRTC pluggable transport for Tor.", "main": "build/snowflake.js", "directories": { @@ -32,4 +32,4 @@ "ws": "^3.3.1", "xmlhttprequest": "^1.8.0" } -} +} \ No newline at end of file diff --git a/translation b/translation index 0f66079..9839968 160000 --- a/translation +++ b/translation @@ -1 +1 @@ -Subproject commit 0f66079eeef65be8c595a9531ed4e4b597ec0fbf +Subproject commit 9839968c45d124011d47a4c5e2110eec853638e2 diff --git a/webext/manifest.json b/webext/manifest.json index 34fc276..8d7fa4d 100644 --- a/webext/manifest.json +++ b/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.4.0", + "version": "0.4.1", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 4abeb8efce46c810580ca0005bbcdacb4a783a98 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 20:17:53 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+ar.po b/contents+ar.po index 584942fe70..fa81e92d22 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -9428,7 +9428,7 @@ msgstr "لا، لا يقدم مشروع Tor خدمات الاستضافة." #: https//support.torproject.org/misc/misc-11/ #: (content/misc/misc-11/contents+en.lrquestion.title) msgid "Can I change the number of hops Tor uses?" -msgstr "" +msgstr "هل يمكنني تغيير عدد القفزات التي يستخدمها Tor؟" #: https//support.torproject.org/misc/misc-11/ #: (content/misc/misc-11/contents+en.lrquestion.description) @@ -9436,6 +9436,8 @@ msgid "" "Right now the path length is hard-coded at 3 plus the number of nodes in " "your path that are sensitive." msgstr "" +"الآن طول المسار مشفر بشكل ثابت عند 3 بالإضافة إلى عدد العقد الحساسة في " +"مسارك." #: https//support.torproject.org/misc/misc-11/ #: (content/misc/misc-11/contents+en.lrquestion.description) @@ -9443,6 +9445,8 @@ msgid "" "That is, in normal cases it's 3, but for example if you're accessing an " "onion service or a \".exit\" address it could be more." msgstr "" +"هذا هو ، في الحالات العادية ، 3 ، ولكن على سبيل المثال إذا كنت تصل إلى خدمة " +"onion أو عنوان \"exit.\" فقد يكون أكثر." #: https//support.torproject.org/misc/misc-11/ #: (content/misc/misc-11/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 15d20f74bcb98da2300e7775d1d63959f74c7ee6 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 19:47:51 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 53 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 39 insertions(+), 14 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index dd6e0c8340..584942fe70 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -9083,7 +9083,7 @@ msgstr "- تحتوي صفحة الويب على مصادر فرعية يتم ت #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.title) msgid "How to Report a Bug or Give Feedback" -msgstr "" +msgstr "كيفية الإبلاغ عن خطأ أو تقديم ملاحظات" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9099,7 +9099,7 @@ msgstr "" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "### Feedback template" -msgstr "" +msgstr "### نموذج التعليقات" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9107,16 +9107,17 @@ msgid "" "When sending us feedback or reporting a bug, please include as many of these" " as possible:" msgstr "" +"عند إرسال تعليقات إلينا أو الإبلاغ عن خطأ ، يُرجى تضمين أكبر عدد ممكن منها:" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "* OS you are using" -msgstr "" +msgstr "* نظام التشغيل الذي تستخدمه" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "* Tor Browser version" -msgstr "" +msgstr "* إصدار متصفح Tor" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9125,32 +9126,35 @@ msgid "" "opened the browser, typed a url, clicked on (i) icon, then my browser " "crashed)" msgstr "" +"* خطوة بخطوة حول كيفية وصولك إلى المشكلة ، حتى نتمكن من إعادة إنتاجها (على " +"سبيل المثال ، فتحت المتصفح ، واكتب عنوان url ، ونقرت على أيقونة (i) ، ثم " +"تعطل المتصفح)" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "* A screenshot of the problem" -msgstr "" +msgstr "* لقطة شاشة للمشكلة" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "* The log" -msgstr "" +msgstr "* السجل" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "### How to Reach Us" -msgstr "" +msgstr "### كيفية التواصل معنا" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "" "There are several ways to reach us, so please use what works best for you." -msgstr "" +msgstr "هناك عدة طرق للتواصل معنا ، لذا يُرجى استخدام أفضل ما يناسبك." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Trac" -msgstr "" +msgstr "#### تراك" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9160,16 +9164,20 @@ msgid "" " Browser 9 related issues with the tbb-9.0-issues keyword. Tickets related " "to our website should be added with the component \"Webpages/Website.\"" msgstr "" +"يمكنك تقديم تذكرة على [https://trac.torproject.org] " +"(https://trac.torproject.org) نحن نتتبع جميع المشكلات المتعلقة بمتصفح Tor 9" +" باستخدام الكلمة الأساسية tbb-9.0. يجب إضافة التذاكر المتعلقة بموقعنا " +"الإلكتروني مع المكون \"صفحات الويب / موقع الويب\"." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Email" -msgstr "" +msgstr "#### البريد الإلكتروني" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "Send us an email to frontdesk(a)torproject.org" -msgstr "" +msgstr "أرسل لنا بريدًا إلكترونيًا إلى frontdesk(a)torproject.org" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9180,6 +9188,11 @@ msgid "" " it will be for us to understand and follow up. Sometimes when we receive " "emails without subject lines, they're marked as spam and we don't see them." msgstr "" +"في سطر موضوع بريدك الإلكتروني ، يرجى إخبارنا بما تقوم بالإبلاغ عنه. كلما كان" +" سطر الموضوع أكثر تحديدًا (على سبيل المثال ، \"فشل الاتصال\" ، \"التعليقات " +"على موقع الويب\" ، \"التعليقات على متصفح Tor\" ، \"أحتاج إلى جسر\") ، سيكون " +"من الأسهل بالنسبة لنا الفهم والمتابعة. في بعض الأحيان ، عندما نتلقى رسائل " +"بريد إلكتروني بدون سطور موضوع ، يتم تمييزها كرسائل غير مرغوب فيها ولا نراها." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9190,11 +9203,15 @@ msgid "" "take us a bit longer to answer as we will need help with translation to " "understand it." msgstr "" +"للحصول على أسرع إجابة ، يرجى الكتابة باللغة الإنجليزية والإسبانية و / أو " +"البرتغالية إذا أمكنك ذلك. إذا لم تكن أي من هذه اللغات مناسبة لك ، فيرجى " +"الكتابة بأي لغة تشعر بالراحة تجاهها ، ولكن ضع في اعتبارك أن الإجابة سوف " +"تستغرق وقتًا أطول قليلاً لأننا سنحتاج إلى المساعدة في الترجمة لفهمها." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) msgid "#### Blog post comments" -msgstr "" +msgstr "#### تعليقات منشورات المدونة" #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9203,6 +9220,9 @@ msgid "" "feedback you want to report. If there is not a blog post related to your " "issue, please contact us another way." msgstr "" +"يمكنك دائمًا ترك تعليقات على منشور المدونة المتعلق بالمشكلة أو التعليقات " +"التي تريد الإبلاغ عنها. إذا لم يكن هناك منشور مدونة متعلق بمشكلتك ، فيرجى " +"الاتصال بنا بطريقة أخرى." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9216,6 +9236,9 @@ msgid "" "bugs/issues. We may not respond right away, but we do check the backlog and " "will get back to you when we can." msgstr "" +"يمكنك أن تجدنا في قناة #tor على OFTC لتزويدنا بالتعليقات أو الإبلاغ عن " +"الأخطاء / المشكلات. قد لا نرد على الفور ، لكننا نتحقق من التراكم وسنعاود " +"الاتصال بك عندما نستطيع." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.description) @@ -9381,7 +9404,7 @@ msgstr "" #: https//support.torproject.org/abuse/help-trace-tor-user/ #: (content/abuse/tracing-users/contents+en.lrquestion.description) msgid "There is nothing the Tor developers can do to trace Tor users." -msgstr "" +msgstr "لا يوجد شيء يمكن لمطوري Tor فعله لتتبع مستخدمي Tor." #: https//support.torproject.org/misc/misc-1/ #: (content/misc/misc-1/contents+en.lrquestion.description) @@ -9389,11 +9412,13 @@ msgid "" "The same protections that keep bad people from breaking Tor's anonymity also" " prevent us from tracking users." msgstr "" +"كما تمنعنا وسائل الحماية نفسها التي تمنع الأشخاص السيئين من اختراق إخفاء " +"هوية Tor من تتبع المستخدمين." #: https//support.torproject.org/misc/misc-10/ #: (content/misc/misc-10/contents+en.lrquestion.title) msgid "Does the Tor Project offer hosting?" -msgstr "" +msgstr "هل يقدم مشروع Tor استضافة؟" #: https//support.torproject.org/misc/misc-10/ #: (content/misc/misc-10/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 84294fae3175a77745c4901a5ff9ecb76ad414e9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 19:18:05 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index a1df40ef53..dd6e0c8340 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -9046,12 +9046,12 @@ msgstr "" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "A green onion with a lock means:" -msgstr "" +msgstr "البصل الأخضر بقفل يعني:" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "- The Onion Service is served over HTTPS with a CA-Issued certificate." -msgstr "" +msgstr "- يتم تقديم خدمة Onion عبر HTTPS بشهادة CA-صادرة." #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -9059,11 +9059,13 @@ msgid "" "![Image of a grey onion with a red slash](/static/images/grey-onion-with-" "red-slash.png)" msgstr "" +"! [صورة بصلة رمادية بشرطة حمراء] (/ static / images / gray-onion-with-red-" +"slash.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "A grey onion with a red slash means:" -msgstr "" +msgstr "البصل الرمادي مع شَرطة حمراء يعني:" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -9071,11 +9073,12 @@ msgid "" "- The Onion Service is served over HTTPS with a self-signed or CA-Issued " "certificate." msgstr "" +"- يتم تقديم خدمة Onion عبر HTTPS بشهادة موقعة ذاتيًا أو شهادة CA-صادرة." #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "- The webpage contains subresources served over HTTP." -msgstr "" +msgstr "- تحتوي صفحة الويب على مصادر فرعية يتم تقديمها عبر HTTP." #: https//support.torproject.org/misc/bug-or-feedback/ #: (content/misc/bug-or-feedback/contents+en.lrquestion.title)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 13 Aug '20

13 Aug '20

commit 93f0adb7a4241f43f3ee122c66ccf654166094de Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 13 18:47:59 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ar.po | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/contents+ar.po b/contents+ar.po index 4b132d1398..a1df40ef53 100644 --- a/contents+ar.po +++ b/contents+ar.po @@ -8988,12 +8988,12 @@ msgid "" "connecting to [DuckDuckGo's onion service](http://3g2upl4pq6kufc4m.onion)." msgstr "" "يمكنك أيضًا التأكد من قدرتك على الوصول إلى خدمات onion الأخرى عن طريق " -"الاتصال بـ [خدمة onion DuckDuckGo] (http://3g2upl4pq6kufc4m.onion)" +"الاتصال بـ [onion service DuckDuckGo] (http://3g2upl4pq6kufc4m.onion)" #: https//support.torproject.org/onionservices/onionservices-4/ #: (content/onionservices/onionservices-4/contents+en.lrquestion.title) msgid "Does the Tor Project run any Onion Services?" -msgstr "" +msgstr "هل يدير مشروع Tor أي خدمات Onion؟" #: https//support.torproject.org/onionservices/onionservices-4/ #: (content/onionservices/onionservices-4/contents+en.lrquestion.description) @@ -9001,11 +9001,13 @@ msgid "" "Yes! A list of our Onion Services is available at " "[onion.torproject.org](https://onion.torproject.org/)." msgstr "" +"نعم! تتوفر قائمة بخدمات Onion الخاصة بنا على [onion.torproject.org] " +"(https://onion.torproject.org/)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.title) msgid "What do the different onion icons in the address bar mean?" -msgstr "" +msgstr "ماذا تعني أيقونات البصل المختلفة في شريط العناوين؟" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -9013,23 +9015,25 @@ msgid "" "When browsing an Onion Service, Tor Browser displays different onion icons " "in the address bar indicating the security of the current webpage." msgstr "" +"عند تصفح خدمة Onion ، يعرض متصفح Tor رموز بصل مختلفة في شريط العناوين تشير " +"إلى أمان صفحة الويب الحالية." #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "![Image of a green onion](/static/images/green-onion.png)" -msgstr "" +msgstr "! [صورة بصلة خضراء] (/ static / images / green-onion.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "A green onion means:" -msgstr "" +msgstr "البصل الأخضر يعني:" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) msgid "" "- The Onion Service is served over HTTP, or HTTPS with a self-signed " "certificate." -msgstr "" +msgstr "- يتم تقديم خدمة Onion عبر HTTP أو HTTPS بشهادة موقعة ذاتيًا." #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description) @@ -9037,6 +9041,7 @@ msgid "" "![Image of a green onion with a lock](/static/images/green-onion-with-" "lock.png)" msgstr "" +"! [صورة بصلة خضراء بقفل] (/ static / images / green-onion-with-lock.png)" #: https//support.torproject.org/onionservices/onionservices-5/ #: (content/onionservices/onionservices-5/contents+en.lrquestion.description)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit ef18fb56c95c7761017eb8bb36a97415d7bb82ce Merge: 26b257757b 7915b651d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.3' into maint-0.4.4 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 8ca478234056e051aed0175a0d3c0b2a9f179fe6 Merge: a7cbbdbbda ef18fb56c9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 1 + 2 files changed, 5 insertions(+)

1 0

[tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit 45d983049382e09d14d5047f9eef941d089e9fb7 Merge: 07f0210a05 72484a4953 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 13 14:20:39 2020 -0400 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.5] Fix allocation counting in clean_v2_descs_as_dir test.
by nickm＠torproject.org 13 Aug '20

13 Aug '20

commit f9bb49d870045fa6e1a2570a65f0583066d8359d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 12 14:25:46 2020 -0400 Fix allocation counting in clean_v2_descs_as_dir test. Without this fix, running this test on its own would fail. Fixes bug 40099. Bugfix on ade5005853c17b3 in 0.2.8.1-alpha. --- changes/bug40099 | 4 ++++ src/test/test_rendcache.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug40099 b/changes/bug40099 new file mode 100644 index 0000000000..278ede2023 --- /dev/null +++ b/changes/bug40099 @@ -0,0 +1,4 @@ + o Minor bugfixes (tests): + - Fix the behavior of the rend_cache/clean_v2_descs_as_dir when run on + its own. Previously, it would exit with an error. + Fixes bug 40099; bugfix on 0.2.8.1-alpha. diff --git a/src/test/test_rendcache.c b/src/test/test_rendcache.c index 4f544cf21c..93f9f82953 100644 --- a/src/test/test_rendcache.c +++ b/src/test/test_rendcache.c @@ -1101,6 +1101,7 @@ test_rend_cache_clean_v2_descs_as_dir(void *data) desc->timestamp = now; desc->pk = pk_generate(0); e->parsed = desc; + rend_cache_increment_allocation(rend_cache_entry_allocation(e)); digestmap_set(rend_cache_v2_dir, key, e); /* Set the cutoff to minus 10 seconds. */ @@ -1250,4 +1251,3 @@ struct testcase_t rend_cache_tests[] = { test_rend_cache_validate_intro_point_failure, 0, NULL, NULL }, END_OF_TESTCASES }; -

1 0