tor-commits October 2019

tor-commits@lists.torproject.org

22 participants
4141 discussions

[translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit 96a5dafb5f6a4a18e158e98d2e08f2b59697ecc3 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 14:45:22 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- mk/LC_MESSAGES/bridgedb.po | 90 +++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 40 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index a4c96e3e2..d9a41542b 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -11,8 +11,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" -"POT-Creation-Date: 2019-10-03 15:04-0700\n" -"PO-Revision-Date: 2019-10-04 14:45+0000\n" +"POT-Creation-Date: 2019-10-19 14:51-0700\n" +"PO-Revision-Date: 2019-10-22 14:45+0000\n" "Last-Translator: Liljana Ackovska <liljanagjurova(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -37,8 +37,8 @@ msgstr "" #. recompiled). `collection_size` sets the number of compiled templates which #. are cached before the least recently used ones are removed. See: #. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup -#. : Localisations which BridgeDB supports which should be rendered right-to- -#. left. +#. : A list of supported language tuples. Use getSortedLangList() to read this +#. variable. #. We use our metrics singleton to keep track of BridgeDB metrics such as #. "number of failed HTTPS bridge requests." #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in @@ -52,19 +52,23 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:135 +#: bridgedb/distributors/https/server.py:138 msgid "Sorry! Something went wrong with your request." msgstr "Извинете! Се случи грешка со вашето барање." -#: bridgedb/distributors/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:42 +msgid "Language" +msgstr "Јазик" + +#: bridgedb/distributors/https/templates/base.html:92 msgid "Report a Bug" msgstr "Пријави проблем" -#: bridgedb/distributors/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:95 msgid "Source Code" msgstr "Изворен код" -#: bridgedb/distributors/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:98 msgid "Changelog" msgstr "Лог на измени" @@ -103,7 +107,8 @@ msgstr "Овој QR код ги содржи вашите мост конекц msgid "There currently aren't any bridges available..." msgstr "Моментално нема достапни мостови..." -#: bridgedb/distributors/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:133 +#: bridgedb/distributors/https/templates/bridges.html:137 #, python-format msgid "" " Perhaps you should try %s going back %s and choosing a different bridge " @@ -125,17 +130,19 @@ msgstr "Преземи %s Tor Browser %s" msgid "Step %s2%s" msgstr "Чекор %s2%s" -#: bridgedb/distributors/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:28 +#: bridgedb/distributors/https/templates/index.html:30 #, python-format msgid "Get %s bridges %s" msgstr "Земи %s мостови %s" -#: bridgedb/distributors/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:40 #, python-format msgid "Step %s3%s" msgstr "Чекор %s3%s" -#: bridgedb/distributors/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:43 +#: bridgedb/distributors/https/templates/index.html:47 #, python-format msgid "Now %s add the bridges to Tor Browser %s" msgstr "Сега %s додади ги мостовите во Tor Browser%s" @@ -144,27 +151,27 @@ msgstr "Сега %s додади ги мостовите во Tor Browser%s" #. beginning of words are present in your final translation. Thanks! #. (These are used to insert HTML5 underlining tags, to mark accesskeys #. for disabled users.) -#: bridgedb/distributors/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:42 #, python-format msgid "%sJ%sust give me bridges!" msgstr "%sС%sамо дај ми мост конекции!" -#: bridgedb/distributors/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:55 msgid "Advanced Options" msgstr "Напредни опции" -#: bridgedb/distributors/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:93 msgid "No" msgstr "Не" -#: bridgedb/distributors/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:94 msgid "none" msgstr "ништо" #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: bridgedb/distributors/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:131 #, python-format msgid "%sY%ses!" msgstr "%sД%sа! Ми требаат IPv6 адреси." @@ -172,7 +179,7 @@ msgstr "%sД%sа! Ми требаат IPv6 адреси." #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the #. beginning of words are present in your final translation. Thanks! #. TRANSLATORS: Please do NOT translate the word "bridge"! -#: bridgedb/distributors/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "%sО%sвозможи Мостови" @@ -216,7 +223,7 @@ msgstr "Здраво, %s!" msgid "Hello, friend!" msgstr "Здраво, пријателу!" -#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 +#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 msgid "Public Keys" msgstr "Јавни клучеви" @@ -291,47 +298,50 @@ msgstr "Друг начин да добиете мостови е да испр msgid "My bridges don't work! I need help!" msgstr "Моите мостови не функционираат! Ми треба помош!" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:117 +#. TRANSLATORS: Please DO NOT translate "Tor Browser". +#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and +#. "Support Portal", respectively. +#: bridgedb/strings.py:119 #, python-format -msgid "If your Tor cannot connect, please take a look at the %s and our %s." -msgstr "Ако вашиот Tor не може да се поврзе, ве молиме погледнете на %sи на нашата %s." +msgid "" +"If your Tor Browser cannot connect, please take a look at the %s and our %s." +msgstr "Ако вашиот Tor Browser не може да се поврзе, погледнете на %s и на %s." -#: bridgedb/strings.py:121 +#: bridgedb/strings.py:123 msgid "Here are your bridge lines:" msgstr "Ова се вашите мост коненции:" -#: bridgedb/strings.py:122 +#: bridgedb/strings.py:124 msgid "Get Bridges!" msgstr "Добиј мостови!" -#: bridgedb/strings.py:126 +#: bridgedb/strings.py:128 msgid "Please select options for bridge type:" msgstr "Одберете опции за тип на мост:" -#: bridgedb/strings.py:127 +#: bridgedb/strings.py:129 msgid "Do you need IPv6 addresses?" msgstr "Дали ви требаат IPv6 адреси?" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 #, python-format msgid "Do you need a %s?" msgstr "Дали ти треба %s?" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:134 msgid "Your browser is not displaying images properly." msgstr "Вашиот прелистувач не ги покажува сликите правилно." -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:135 msgid "Enter the characters from the image above..." msgstr "Внесете ги карактерите од сликата погоре:" -#: bridgedb/strings.py:137 +#: bridgedb/strings.py:139 msgid "How to start using your bridges" msgstr "Како да започнете со користење на мостови" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -340,21 +350,21 @@ msgid "" msgstr "Да внесете мостови во Tor Browser, прво одете на %s Tor Browser за преземање\nстраната %s и потоа следете ги инструкциите за преземање и стартување на Tor Browser." #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:146 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Кога дијалогот 'Tor мрежни поставки' ќе се појави, кликнете на 'Конфигурирај' и следете\nго инсталерот додека да ве праша:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 +#: bridgedb/strings.py:150 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Дали вашиот Интернет сервис провајдер (ISP) блокира или цензурира поврзувања кон Tor мрежата?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:154 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -362,28 +372,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Одберете 'Да' и кликнете 'Следно'. За да ги конфигурирате вашите нови мостови, копирајте и\nзалепете ја мост линијата во текст полето. На крај кликнете 'Поврзи', и\nби требало да сте готови! Ако имате проблеми, пробајте со кликање на 'Помош'\nкопчето во 'Tor мрежни подесувања' и следете ги инструкциите." -#: bridgedb/strings.py:160 +#: bridgedb/strings.py:162 msgid "Displays this message." msgstr "Ја покажува оваа порака." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: bridgedb/strings.py:164 +#: bridgedb/strings.py:166 msgid "Request vanilla bridges." msgstr "Побарува стандардни мостови." -#: bridgedb/strings.py:165 +#: bridgedb/strings.py:167 msgid "Request IPv6 bridges." msgstr "Побарува IPv6 мостови." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request a Pluggable Transport by TYPE." msgstr "Побарува Pluggable Transport по тип." #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:170 +#: bridgedb/strings.py:172 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "Преземи копија од јавниот GnuPG клуч на BridgeDB."

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit b898e94b08874c32d6b1a0ba85dbae3183f9d74b Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 14:45:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- mk/LC_MESSAGES/bridgedb.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po index 28b3f2bb7..d9a41542b 100644 --- a/mk/LC_MESSAGES/bridgedb.po +++ b/mk/LC_MESSAGES/bridgedb.po @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2019-10-19 14:51-0700\n" -"PO-Revision-Date: 2019-10-22 01:44+0000\n" +"PO-Revision-Date: 2019-10-22 14:45+0000\n" "Last-Translator: Liljana Ackovska <liljanagjurova(a)gmail.com>\n" "Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n" "MIME-Version: 1.0\n" @@ -305,7 +305,7 @@ msgstr "Моите мостови не функционираат! Ми треб #, python-format msgid "" "If your Tor Browser cannot connect, please take a look at the %s and our %s." -msgstr "" +msgstr "Ако вашиот Tor Browser не може да се поврзе, погледнете на %s и на %s." #: bridgedb/strings.py:123 msgid "Here are your bridge lines:"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit 8a3b6e94da993b36ef527399b5322d2826277298 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 14:23:20 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index a9cc61c46..7c12158fe 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -154,7 +154,7 @@ msgstr "Succes" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "You're equipped to browse freely." -msgstr "Je bent uitgerust om in vrijheid te surfen." +msgstr "U bent uitgerust om in vrijheid te surfen." #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) @@ -176,8 +176,8 @@ msgid "" "We need your help to keep Tor secure and safe for millions across the globe." " [Donate Now](https://donate.torproject.org/)" msgstr "" -"We hebben je hulp nodig om Tor veilig en beveiligd te houden voor miljoenen " -"gebruikers over de hele wereld. [Doneer nu](https://donate.torproject.org/)" +"We hebben uw hulp nodig om Tor voor miljoenen gebruikers over de hele wereld" +" veilig te houden. [Doneer nu](https://donate.torproject.org/)" #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title) #: https//www.torproject.org/about/history/ @@ -207,15 +207,15 @@ msgid "" "bugs](https://support.torproject.org/misc/bug-or-feedback/), and are not " "putting yourself at risk." msgstr "" -"Download alstublieft alleen een alfa-versie als u aanvaard dat sommige " -"dingen niet naar behoren werken, als u ons wilt helpen om fouten op te " -"sporen en [foutverslagen](https://support.torproject.org/misc/bug-or-" -"feedback/) te schrijven en als u zelf geen risico zal lopen." +"Download alleen een alfa als u het niet erg vindt als sommige dingen niet " +"naar behoren werken, ons wilt helpen [bugs te " +"melden](https://support.torproject.org/misc/bug-or-feedback/) en te vinden, " +"en zelf geen risico loopt." #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.title) msgid "Download Tor Browser in your language" -msgstr "Download Tor Browser in je eigen taal" +msgstr "Download Tor Browser in uw eigen taal" #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.body) @@ -372,9 +372,9 @@ msgid "" "contact Sarah Stevenson, Fundraising Director, at " "[sstevenson@torproject.org](mailto:sstevenson@torproject.org)." msgstr "" -"Als je iemand van het Tor Project wilt spreken over of de organisatie wel of" -" niet geschikt is voor een _Cy-Près_ prijs, neem dan alstublieft contact op " -"met Sarah Stevenson, directrice fondswerving, via " +"Als u iemand van het Tor Project wilt spreken over of de organisatie wel of " +"niet geschikt is voor een _cy pres_-prijs, neem dan contact op met Sarah " +"Stevenson, directeur Fondsenwerving, via " "[sstevenson@torproject.org](mailto:sstevenson@torproject.org)." #: https//www.torproject.org/about/cy-pres/ @@ -736,9 +736,9 @@ msgid "" "source, you can download the source code for 0.4.0.1-alpha from the usual " "place on the website." msgstr "" -"Er is een nieuwe alfa-uitgave beschikbaar om te downloaden. Als je Tor " -"vanuit de broncode bouwt, dan kun je de broncode voor 0.4.0.1-alfa " -"downloaden van de gebruikelijke plaats op onze website." +"Er is een nieuwe alfaversie beschikbaar om te downloaden. Als u Tor vanuit " +"de broncode bouwt, kunt u de broncode voor 0.4.0.1-alpha vanaf de " +"gebruikelijke plaats op de website downloaden." #: https//www.torproject.org/press/-new-release-tor-browser/ #: (content/press/new-release-tor-browser/contents+en.lrpost.title) @@ -987,11 +987,11 @@ msgid "" "our support portal, you can ask the appropriate list. You're welcome to " "subscribe and just watch, too :)" msgstr "" -"Ons team werkt samen via open kanalen, inclusief e-maillijsten van welke je " -"lid mag worden. Als je vragen hebt voor een specifiek team welke nog niet " -"worden beantwoord in onze ondersteuningspagina, dan kun je die vragen " -"stellen in de daarvoor aangewezen e-maillijst. Het staat je ook vrij om je " -"in te schrijven en mee te lezen. :)" +"Ons team werkt samen via open kanalen, waaronder mailinglijsten, waarvan u " +"lid mag worden. Als u een vraag hebt voor een bepaald team die nog niet op " +"onze ondersteuningsportal is beantwoord, kunt u die stellen via de daarvoor " +"aangewezen mailinglijst. Het staat u ook vrij om u in te schrijven en alleen" +" mee te lezen. :)" #: templates/contact.html:63 msgid "Report a bug or give feedback."

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit fdfa08abfb991984866af6517b447ec7d349c3f2 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 13:53:32 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index 2edec2b34..a9cc61c46 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -1045,10 +1045,10 @@ msgid "" "list by contacting tor-security-sendkey(a)lists.torproject.org or from pool" ".sks-keyservers.net. Here is the fingerprint:" msgstr "" -"Als u uw e-mail wilt versleutelen, dan kunt u de publieke-GPGsleutel voor de" -" e-maillijst ontvangen door contact op te nemen met tor-security-" -"sendkey(a)lists.torproject.org of van onze pool.sks-keyservers.net. Hier is de" -" fingerprint:" +"Als u uw e-mail wilt versleutelen, kunt u de publieke GPG-sleutel voor de " +"mailinglijst ontvangen door contact op te nemen met tor-security-" +"sendkey(a)lists.torproject.org, of vanaf pool.sks-keyservers.net. Hier is de " +"vingerafdruk:" #: templates/contact.html:100 msgid "Email us" @@ -1061,10 +1061,10 @@ msgid "" "email frontdesk(a)torproject.org. For donor-related questions, contact " "giving(a)torproject.org" msgstr "" -"Voor vragen en opmerkingen over Tor de organisatie zonder winstoogmerk: " -"handelsnaam vragen, affiliaties en coördinatie, contactvezoeken, etc., neem " -"e-mail-contact op met frontdesk(a)torproject.org. Neem voor donor-gerelateerde" -" vragen contact op met giving(a)torproject.org" +"Stuur voor vragen en opmerkingen over Tor, de non-profitorganisatie, " +"handelsnaamvragen, aansluitingen en coördinatie, contractverzoeken etc. een " +"e-mail naar frontdesk(a)torproject.org. Neem voor donatiegerelateerde vragen " +"contact op met giving(a)torproject.org." #: templates/contact.html:107 msgid "Send us Mail"

1 0

[translation/tpo-web] https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
by translation＠torproject.org 22 Oct '19

22 Oct '19

commit 7fd5bf4f8197505a2030ed7a850775a8c830ddd1 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 22 13:23:23 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tpo-web --- contents+nl.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/contents+nl.po b/contents+nl.po index 4e60e2239..2edec2b34 100644 --- a/contents+nl.po +++ b/contents+nl.po @@ -6,6 +6,7 @@ # Emma Peel, 2019 # erinm, 2019 # Meteor 0id, 2019 +# Tonnes <tonnes.mb(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -13,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-18 16:11+CET\n" "PO-Revision-Date: 2019-03-09 10:41+0000\n" -"Last-Translator: Meteor 0id, 2019\n" +"Last-Translator: Tonnes <tonnes.mb(a)gmail.com>, 2019\n" "Language-Team: Dutch (https://www.transifex.com/otf/teams/1519/nl/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -50,8 +51,8 @@ msgid "" "We advance human rights and defend your privacy online through free software" " and open networks. [Meet our team](about/people)." msgstr "" -"We bevorderen mensenrechten en verdedigen je privacy online door middel van " -"vrije software en open netwerken. [Leer ons team kennen](about/people)." +"We bevorderen mensenrechten en verdedigen uw privacy online door middel van " +"vrije software en open netwerken. [Maak kennis met ons team](about/people)." #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.title) @@ -158,7 +159,7 @@ msgstr "Je bent uitgerust om in vrijheid te surfen." #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "Tor is the strongest tool for privacy and freedom online." -msgstr "Tor is het sterkste gereedschap voor privacy en vrijheid online." +msgstr "Tor is het sterkste hulpmiddel voor privacy en vrijheid online." #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) @@ -1029,10 +1030,10 @@ msgid "" "infrastructure, please email tor-security(a)lists.torproject.org. If you've " "found a security bug in Tor or Tor Browser, feel free to submit it for our" msgstr "" -"Als u een beveiligingsprobleem heeft ontdekt in een van onze projecten of " -"infrastructuur, e-mail dan naar tor-security(a)lists.torproject.org. Als u een" -" beveiligingsprobleem hebt ontdekt in Tor of in Tor Browser, voelt u zich " -"dan vrij om die in te dienen voor ons" +"Als u een beveiligingsprobleem in een van onze projecten of in onze " +"infrastructuur hebt ontdekt, stuur dan een e-mail naar tor-" +"security(a)lists.torproject.org. Als u een beveiligingsbug in Tor of Tor " +"Browser hebt ontdekt, voel u dan vrij om die in te dienen voor ons" #: templates/contact.html:80 msgid "bug bounty program."

1 0

[tor/master] Check tor_vasprintf for error return values.
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit d91ad5112e91bfed59bebb657feacac64d34494f Author: Tobias Stoeckmann <tobias(a)stoeckmann.org> Date: Wed Jul 10 20:39:57 2019 +0200 Check tor_vasprintf for error return values. In case of error, a negative value will be returned or NULL written into first supplied argument. This patch uses both cases to comply with style in the specific files. A tor_vasprintf error in process_vprintf would lead to a NULL dereference later on in buf_add, because the return value -1 casted to size_t would pass an assertion check inside of buf_add. On the other hand, common systems will fail on such an operation, so it is not a huge difference to a simple assertion. Yet it is better to properly fail instead of relying on such behaviour on all systems. Signed-off-by: Tobias Stoeckmann <tobias(a)stoeckmann.org> --- src/feature/control/control_events.c | 5 ++++- src/lib/buf/buffers.c | 1 + src/lib/process/process.c | 1 + 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/feature/control/control_events.c b/src/feature/control/control_events.c index 82ea94399..00659c047 100644 --- a/src/feature/control/control_events.c +++ b/src/feature/control/control_events.c @@ -1653,7 +1653,10 @@ control_event_status(int type, int severity, const char *format, va_list args) log_warn(LD_BUG, "Format string too long."); return -1; } - tor_vasprintf(&user_buf, format, args); + if (tor_vasprintf(&user_buf, format, args)<0) { + log_warn(LD_BUG, "Failed to create user buffer."); + return -1; + } send_control_event(type, "%s %s\r\n", format_buf, user_buf); tor_free(user_buf); diff --git a/src/lib/buf/buffers.c b/src/lib/buf/buffers.c index 4d026bd37..452bf7437 100644 --- a/src/lib/buf/buffers.c +++ b/src/lib/buf/buffers.c @@ -578,6 +578,7 @@ buf_add_vprintf(buf_t *buf, const char *format, va_list args) /* XXXX Faster implementations are easy enough, but let's optimize later */ char *tmp; tor_vasprintf(&tmp, format, args); + tor_assert(tmp != NULL); buf_add(buf, tmp, strlen(tmp)); tor_free(tmp); } diff --git a/src/lib/process/process.c b/src/lib/process/process.c index 2194a603f..b01c99992 100644 --- a/src/lib/process/process.c +++ b/src/lib/process/process.c @@ -550,6 +550,7 @@ process_vprintf(process_t *process, char *data; size = tor_vasprintf(&data, format, args); + tor_assert(data != NULL); process_write(process, (uint8_t *)data, size); tor_free(data); }

1 0

[tor/master] Add changes file for #31147
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 8162859ef727619493cfd9368214d3a769b338cb Author: Alexander Færøy <ahf(a)torproject.org> Date: Wed Oct 16 18:07:28 2019 +0200 Add changes file for #31147 See: https://bugs.torproject.org/31147 --- changes/31147 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/31147 b/changes/31147 new file mode 100644 index 000000000..d6f5cbdf4 --- /dev/null +++ b/changes/31147 @@ -0,0 +1,3 @@ + o Minor features (defense in depth): + - Add additional sanity checks around tor_vasprintf() usage in case the + function returns an error. Patch by Tobias Stoeckmann. Fixes ticket 31147.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1417'
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 2d013bbe5cccaccf9ace0beec5a987fb80e850ad Merge: a1d534137 8162859ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 22 08:36:32 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1417' changes/31147 | 3 +++ src/feature/control/control_events.c | 5 ++++- src/lib/buf/buffers.c | 1 + src/lib/process/process.c | 1 + 4 files changed, 9 insertions(+), 1 deletion(-)

1 0

[tor/master] Remove a lot of cruft from TEST_OPTIONS_DEFAULT_VALUES.
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit 3f9920975f2b05c516deb892ff1b728c2a3c5146 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 14:05:07 2019 -0400 Remove a lot of cruft from TEST_OPTIONS_DEFAULT_VALUES. This macro used to have a big list of "default" values that we needed to set in the test_options tests in order to have reasonable behavior. But now that we initialize options objects to the default settings in these tests, we no longer need such a long list of things to replace. --- src/test/test_options.c | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 1506e2f8a..9169ff914 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -390,24 +390,10 @@ fixed_get_uname(void) return fixed_get_uname_result; } -#define TEST_OPTIONS_OLD_VALUES "TestingV3AuthInitialVotingInterval 1800\n" \ - "ClientBootstrapConsensusMaxInProgressTries 3\n" - -#define TEST_OPTIONS_DEFAULT_VALUES TEST_OPTIONS_OLD_VALUES \ +#define TEST_OPTIONS_DEFAULT_VALUES \ "MaxClientCircuitsPending 1\n" \ - "RendPostPeriod 1000\n" \ "KeepAlivePeriod 1\n" \ - "ConnLimit 1\n" \ - "V3AuthVotingInterval 300\n" \ - "V3AuthVoteDelay 20\n" \ - "V3AuthDistDelay 20\n" \ - "V3AuthNIntervalsValid 3\n" \ - "ClientUseIPv4 1\n" \ - "VirtualAddrNetworkIPv4 127.192.0.0/10\n" \ - "VirtualAddrNetworkIPv6 [FE80::]/10\n" \ - "UseEntryGuards 1\n" \ - "Schedulers Vanilla\n" \ - "ClientDNSRejectInternalAddresses 1\n" + "ConnLimit 1\n" typedef struct { or_options_t *old_opt; @@ -451,7 +437,7 @@ get_options_test_data(const char *conf) config_free_lines(cl); result->opt->LogTimeGranularity = 1; result->opt->TokenBucketRefillInterval = 1; - rv = config_get_lines(TEST_OPTIONS_OLD_VALUES, &cl, 1); + rv = config_get_lines("", &cl, 1); tt_int_op(rv, OP_EQ, 0); rv = config_assign(get_options_mgr(), result->def_opt, cl, 0, &msg); if (msg) {

1 0

[tor/master] test_options: use testing options with (almost) real defaults.
by nickm＠torproject.org 22 Oct '19

22 Oct '19

commit a10e4d737e687fc848edbf27f2bada199545f77b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 21 14:00:06 2019 -0400 test_options: use testing options with (almost) real defaults. Previously, we just used options set to all 0s, but this causes some pretty severe workarounds throughout the code, as our options fail to validate, or count as "default" for the wrong reasons. Note that in some places, we stop getting spurious warnings or failures which the tests previously demanded. In these cases, I've changed the test behavior. Fixes 32175. --- src/test/test_options.c | 52 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 16 deletions(-) diff --git a/src/test/test_options.c b/src/test/test_options.c index 69407a999..1506e2f8a 100644 --- a/src/test/test_options.c +++ b/src/test/test_options.c @@ -391,11 +391,7 @@ fixed_get_uname(void) } #define TEST_OPTIONS_OLD_VALUES "TestingV3AuthInitialVotingInterval 1800\n" \ - "ClientBootstrapConsensusMaxInProgressTries 3\n" \ - "TestingV3AuthInitialVoteDelay 300\n" \ - "TestingV3AuthInitialDistDelay 300\n" \ - "TestingClientMaxIntervalWithoutRequest 600\n" \ - "TestingDirConnectionMaxStall 600\n" \ + "ClientBootstrapConsensusMaxInProgressTries 3\n" #define TEST_OPTIONS_DEFAULT_VALUES TEST_OPTIONS_OLD_VALUES \ "MaxClientCircuitsPending 1\n" \ @@ -432,12 +428,17 @@ get_options_test_data(const char *conf) result->old_opt = options_new(); result->def_opt = options_new(); - // XXX: Really, all of these options should be set to defaults - // with options_init(), but about a dozen tests break when I do that. - // Being kinda lame and just fixing the immedate breakage for now.. - result->opt->ConnectionPadding = -1; // default must be "auto" - result->opt->DormantClientTimeout = 1800; // must be over 600. - result->opt->CircuitPadding = 1; // default must be "1" + options_init(result->opt); + options_init(result->old_opt); + options_init(result->def_opt); + + /* Various of the tests below expect that unless explicitly set, these + * options will be invalid. We override them for that reason. + * + * Later in this branch, I will remove these one by one. */ + result->opt->ConnLimit = 0; + result->opt->MaxClientCircuitsPending = 0; + result->opt->KeepalivePeriod = 0; rv = config_get_lines(conf, &cl, 1); tt_int_op(rv, OP_EQ, 0); @@ -1589,10 +1590,11 @@ test_options_validate__reachable_addresses(void *ignored) options_test_data_t *tdata = get_options_test_data( "FascistFirewall 1\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + tt_int_op(ret, OP_EQ, 0); expect_log_msg("Converting FascistFirewall config " "option to new format: \"ReachableDirAddresses *:80\"\n"); tt_str_op(tdata->opt->ReachableDirAddresses->value, OP_EQ, "*:80"); @@ -1607,11 +1609,16 @@ test_options_validate__reachable_addresses(void *ignored) "ReachableDirAddresses *:81\n" "ReachableORAddresses *:444\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); tdata->opt->FirewallPorts = smartlist_new(); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + tt_int_op(ret, OP_EQ, 0); +#if 0 + /* This does not actually produce any logs, and did not produce any relevant + * logs before. */ expect_log_entry(); +#endif tt_str_op(tdata->opt->ReachableDirAddresses->value, OP_EQ, "*:81"); tt_str_op(tdata->opt->ReachableORAddresses->value, OP_EQ, "*:444"); tor_free(msg); @@ -1621,10 +1628,11 @@ test_options_validate__reachable_addresses(void *ignored) tdata = get_options_test_data("FascistFirewall 1\n" "FirewallPort 123\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + tt_int_op(ret, OP_EQ, 0); expect_log_msg("Converting FascistFirewall and " "FirewallPorts config options to new format: " "\"ReachableAddresses *:123\"\n"); @@ -1638,11 +1646,16 @@ test_options_validate__reachable_addresses(void *ignored) "ReachableAddresses *:83\n" "ReachableAddresses reject *:*\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + tt_int_op(ret, OP_EQ, 0); +#if 0 + /* This does not actually produce any logs, and did not produce any relevant + * logs before. */ expect_log_entry(); +#endif tt_str_op(tdata->opt->ReachableAddresses->value, OP_EQ, "*:82"); tor_free(msg); @@ -1651,10 +1664,11 @@ test_options_validate__reachable_addresses(void *ignored) tdata = get_options_test_data("FascistFirewall 1\n" "ReachableAddresses *:82\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); - tt_int_op(ret, OP_EQ, -1); + tt_int_op(ret, OP_EQ, 0); tt_ptr_op(tdata->opt->ReachableAddresses->next, OP_EQ, NULL); tor_free(msg); @@ -1666,6 +1680,7 @@ test_options_validate__reachable_addresses(void *ignored) tdata = get_options_test_data("ReachableAddresses *:82\n" "ORPort 127.0.0.1:5555\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1677,6 +1692,7 @@ test_options_validate__reachable_addresses(void *ignored) tdata = get_options_test_data("ReachableORAddresses *:82\n" "ORPort 127.0.0.1:5555\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1688,6 +1704,7 @@ test_options_validate__reachable_addresses(void *ignored) tdata = get_options_test_data("ReachableDirAddresses *:82\n" "ORPort 127.0.0.1:5555\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1699,6 +1716,7 @@ test_options_validate__reachable_addresses(void *ignored) tdata = get_options_test_data("ClientUseIPv4 0\n" "ORPort 127.0.0.1:5555\n" "MaxClientCircuitsPending 1\n" + "KeepalivePeriod 1\n" "ConnLimit 1\n"); ret = options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg); @@ -1913,6 +1931,7 @@ test_options_validate__safe_logging(void *ignored) int ret; char *msg; options_test_data_t *tdata = get_options_test_data( + "SafeLogging 0\n" "MaxClientCircuitsPending 1\n" "ConnLimit 1\n"); @@ -2420,6 +2439,7 @@ test_options_validate__circuits(void *ignored) free_options_test_data(tdata); mock_clean_saved_logs(); tdata = get_options_test_data(TEST_OPTIONS_DEFAULT_VALUES + "LearnCircuitBuildTimeout 0\n" "CircuitBuildTimeout 1\n" ); options_validate(tdata->old_opt, tdata->opt, tdata->def_opt, 0, &msg);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2019