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

[sbws/master] fix: scanner: catch all possible exceptions
by juga＠torproject.org 27 Mar '19

27 Mar '19

commit eb749c09cc28ff5297b4ac770543a6bfbcb996ba Author: juga0 <juga(a)riseup.net> Date: Sat Mar 23 13:28:31 2019 +0000 fix: scanner: catch all possible exceptions calling requests.get, since RequestException does not catch all. --- sbws/core/scanner.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index 5b28637..32752ca 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -98,8 +98,11 @@ def timed_recv_from_server(session, dest, byte_range): try: # headers are merged with the session ones, not overwritten. session.get(dest.url, headers=HTTP_GET_HEADERS, verify=dest.verify) - # Catch any `requests` exception, so that it can stored in the Result - except requests.exceptions.RequestException as e: + # All `requests` exceptions could be caught with + # `requests.exceptions.RequestException`, but it seems that `requests` + # does not catch all the ssl exceptions and urllib3 doesn't seem to have + # a base exception class. + except Exception as e: log.debug(e) return False, e end_time = time.time()

1 0

[sbws/master] fix: scanner: log traceback instead of print it
by juga＠torproject.org 27 Mar '19

27 Mar '19

commit 0f33d3a4a5d21c00b1210148e624f7098d0ddf0e Author: juga0 <juga(a)riseup.net> Date: Tue Mar 26 13:28:34 2019 +0000 fix: scanner: log traceback instead of print it --- sbws/core/scanner.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbws/core/scanner.py b/sbws/core/scanner.py index fdb44eb..d3ed5b1 100644 --- a/sbws/core/scanner.py +++ b/sbws/core/scanner.py @@ -70,7 +70,7 @@ def dumpstacks(): for thread_id, stack in sys._current_frames().items(): log.critical("Thread: %s(%d)", thread_id2name.get(thread_id, ""), thread_id) - log.critical(traceback.print_stack(stack)) + log.critical(traceback.format_stack("".join(stack))) # If logging level is less than DEBUG (more verbose), start pdb so that # developers can debug the issue. if log.getEffectiveLevel() < logging.DEBUG: @@ -635,8 +635,10 @@ def force_get_results(pending_results): log.critical(FILLUP_TICKET_MSG) # If the exception happened in the threads, `log.exception` does # not have the traceback. - log.warning("traceback %s", - traceback.print_exception(type(e), e, e.__traceback__)) + # Using `format_exception` instead of of `print_exception` to show + # the traceback in all the log handlers. + log.warning("".join(traceback.format_exception( + type(e), e, e.__traceback__))) def run_speedtest(args, conf):

1 0

[sbws/master] fix: relaylist: catch exception accessing exit_policy
by juga＠torproject.org 27 Mar '19

27 Mar '19

commit 32f283f75965bde77ff2b3e6208b8a9f106e7708 Author: juga0 <juga(a)riseup.net> Date: Tue Mar 26 09:24:42 2019 +0000 fix: relaylist: catch exception accessing exit_policy --- sbws/lib/relaylist.py | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/sbws/lib/relaylist.py b/sbws/lib/relaylist.py index febc717..289e0d2 100644 --- a/sbws/lib/relaylist.py +++ b/sbws/lib/relaylist.py @@ -228,9 +228,23 @@ class Relay: """ assert isinstance(port, int) # if dind't get the descriptor, there isn't exit policy - if not self.exit_policy: + # When the attribute is gotten in getattr(self._desc, "exit_policy"), + # is possible that stem's _input_rules is None and raises an exception + # (#29899): + # File "/usr/lib/python3/dist-packages/sbws/lib/relaylist.py", line 117, in can_exit_to_port # noqa + # if not self.exit_policy: + # File "/usr/lib/python3/dist-packages/stem/exit_policy.py", line 512, in __len__ # noqa + # return len(self._get_rules()) + # File "/usr/lib/python3/dist-packages/stem/exit_policy.py", line 464, in _get_rules # noqa + # for rule in decompressed_rules: + # TypeError: 'NoneType' object is not iterable + # Therefore, catch the exception here. + try: + if self.exit_policy: + return self.exit_policy.can_exit_to(port=port) + except TypeError: return False - return self.exit_policy.can_exit_to(port=port) + return False def is_exit_not_bad_allowing_port(self, port): return (Flag.BADEXIT not in self.flags and

1 0

[sbws/master] CI: disable doclinks temporally
by juga＠torproject.org 27 Mar '19

27 Mar '19

commit 4455b81c5bc3c872f262dba39ca266aff047bb26 Author: juga0 <juga(a)riseup.net> Date: Wed Mar 27 07:57:47 2019 +0000 CI: disable doclinks temporally since Travis is failing to check github.com with forbidden error, but it doesn't fail locally (https://travis-ci.org/torproject/sbws/jobs/511862070#L1938) --- .travis.yml | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index aa477ef..1afe725 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,7 +9,7 @@ script: - tox # This is not in included in the tox envlist, in order to don't need Internet # when running tox - - tox -e doclinks + # - tox -e doclinks - tox -e clean before_install: diff --git a/tox.ini b/tox.ini index 7109cc5..4136036 100644 --- a/tox.ini +++ b/tox.ini @@ -4,7 +4,7 @@ envlist = py35, py36, inst, setup, unit, integration, lint, stats, doc [travis] python = - 3.5: py35, inst, setup, unit, integration, lint, doc, doclinks + 3.5: py35, inst, setup, unit, integration, lint, doc 3.6: py36, inst, setup, unit, integration [testenv]

1 0

[newsletter/master] Make .htaccess work
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit af15c3e82657ccb5ca021b172dfe18865f87cd28 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 10:55:11 2019 +0100 Make .htaccess work --- .htaccess | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.htaccess b/.htaccess index e69de29..d99bfa2 100644 --- a/.htaccess +++ b/.htaccess @@ -0,0 +1,2 @@ + +

1 0

[styleguide/master] Make .htaccess work
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 14323de368329186e7a214a4feedeefe1c338a5d Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 10:54:12 2019 +0100 Make .htaccess work --- .htaccess | 1 + 1 file changed, 1 insertion(+) diff --git a/.htaccess b/.htaccess index e69de29..8d1c8b6 100644 --- a/.htaccess +++ b/.htaccess @@ -0,0 +1 @@ +

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 27 Mar '19

27 Mar '19

commit 4fc2910cd08c9db263d7b12f50de802ee78b41d5 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 27 09:50:11 2019 +0000 Update translations for tpo-web --- contents+es.po | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contents+es.po b/contents+es.po index 4f86ed203..d2a78942f 100644 --- a/contents+es.po +++ b/contents+es.po @@ -967,7 +967,7 @@ msgstr "Gestora de subvenciones." #: https//www.torproject.org/about/people/mcs/ #: (content/about/people/mcs/contents+en.lrperson.description) msgid "Developer on the Tor Browser team." -msgstr "Desarrolladora en el equipo del navegador Tor." +msgstr "Desarrollador/a en el equipo del navegador Tor." #: https//www.torproject.org/about/people/komlo/ #: (content/about/people/komlo/contents+en.lrperson.description) @@ -1070,8 +1070,7 @@ msgstr "" #: (content/about/people/phoul/contents+en.lrperson.description) msgid "Relay advocate, Outreachy mentor, and a member of the community team." msgstr "" -"Defensor de relays, mentor de Outreachy y miembro del equipo de la " -"comunidad." +"Defensor de relays, mentor de Outreachy y miembro del equipo comunidad." #: https//www.torproject.org/about/people/phoul/ #: (content/about/people/phoul/contents+en.lrperson.description)

1 0

[tpo/master] Update to press model
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit 5134b6baea39d15ee6451a7c997eab504d415e53 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 10:49:26 2019 +0100 Update to press model --- content/press/contents.lr | 8 ++++---- content/press/new-release-tails/contents.lr | 2 -- content/press/new-release-tor-browser/contents.lr | 2 -- content/press/new-release-tor/contents.lr | 2 -- models/post.ini | 1 - models/press.ini | 2 -- 6 files changed, 4 insertions(+), 13 deletions(-) diff --git a/content/press/contents.lr b/content/press/contents.lr index d360c09..2176b41 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -2,6 +2,10 @@ _template: layout.html --- _model: press --- +_discoverable: yes +--- +_hidden: no +--- section: The Tor Project --- section_id: the_tor_project @@ -12,8 +16,4 @@ color: primary --- title: Press --- -_discoverable: yes ---- -_hidden: no ---- body: Email inquiries to press[(a)]torproject.org. diff --git a/content/press/new-release-tails/contents.lr b/content/press/new-release-tails/contents.lr index 025a222..e1c6b38 100644 --- a/content/press/new-release-tails/contents.lr +++ b/content/press/new-release-tails/contents.lr @@ -1,7 +1,5 @@ _model: post --- -_hidden: yes ---- active: True --- type: release diff --git a/content/press/new-release-tor-browser/contents.lr b/content/press/new-release-tor-browser/contents.lr index 91ee759..c6f4739 100644 --- a/content/press/new-release-tor-browser/contents.lr +++ b/content/press/new-release-tor-browser/contents.lr @@ -1,7 +1,5 @@ _model: post --- -_hidden: yes ---- active: True --- type: release diff --git a/content/press/new-release-tor/contents.lr b/content/press/new-release-tor/contents.lr index e0a4bc1..9301145 100644 --- a/content/press/new-release-tor/contents.lr +++ b/content/press/new-release-tor/contents.lr @@ -1,7 +1,5 @@ _model: post --- -_hidden: yes ---- active: True --- type: release diff --git a/models/post.ini b/models/post.ini index 5276910..3c78581 100644 --- a/models/post.ini +++ b/models/post.ini @@ -1,7 +1,6 @@ [model] name = Post label = {{ this.name }} -hidden = yes [fields.title] label = Title diff --git a/models/press.ini b/models/press.ini index c3c4dca..3757f1b 100644 --- a/models/press.ini +++ b/models/press.ini @@ -1,8 +1,6 @@ [model] name = Press label = {{ this.title }} -discoverable = yes -hidden = no [fields.title] label = Title

1 0

[translation/donatepages-messagespot] Update translations for donatepages-messagespot
by translation＠torproject.org 27 Mar '19

27 Mar '19

commit 4696f1f7c28d2f9c5c5fc9cb4e0ccc79f4e87fab Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 27 09:45:33 2019 +0000 Update translations for donatepages-messagespot --- locale/is/LC_MESSAGES/messages.po | 48 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 47 insertions(+), 1 deletion(-) diff --git a/locale/is/LC_MESSAGES/messages.po b/locale/is/LC_MESSAGES/messages.po index 4e0f9e7b6..ae7f2ce4c 100644 --- a/locale/is/LC_MESSAGES/messages.po +++ b/locale/is/LC_MESSAGES/messages.po @@ -1222,10 +1222,12 @@ msgid "" "If you pay taxes in the United States, your donation to Tor is tax " "deductible to the full extent required by law." msgstr "" +"Ef þú greiðir skatta í Bandaríkjunum, er styrkur þinn til Tor að fullu " +"frádráttarbær frá sköttum eins og lög gera ráð fyrir." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:246 msgid "Following is information you may need for reporting purposes:" -msgstr "" +msgstr "Eftirfarandi upplýsingar gætirðu þurft að nota við gerð framtals:" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:251 msgid "" @@ -1237,6 +1239,13 @@ msgid "" " Phone number: 206-420-3136 \n" " Contact person: Isabela Bagueros, Executive Director " msgstr "" +"Tor Project Tax ID Number (EIN #): 20-8096820 \n" +" Heimilisfang: \n" +" The Tor Project, Inc. \n" +" 217 First Avenue South #4903 \n" +" Seattle, WA 98194 \n" +" Símanúmer: 206-420-3136 \n" +" Tengiliður: Isabela Bagueros, Executive Director " #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:264 msgid "If I am not in the United States, can I still donate?" @@ -1251,6 +1260,9 @@ msgid "" "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. " "income) but we would very much appreciate your support." msgstr "" +"Styrkur frá þér er að öllum líkindum ekki frádráttarbær (nema þú greiðir " +"skatta af innkomu í Bandaríkjunum) en við myndum eftir sem áður meta mikils " +"stuðning frá þér." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:276 msgid "" @@ -1311,12 +1323,18 @@ msgid "" "For users logging in to Paypal: some people had no problem donating via " "PayPal while using Tor Browser." msgstr "" +"Fyrir notendur sem skrá sig inn á Paypal: sumir notendur hafa ekki átt í " +"neinum erfiðleikum með að gefa í gegnum PayPal á meðan Tor-vafrinn var " +"notaður." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:306 msgid "" "In past years, some people couldn't complete the donation process, and one " "person had their PayPal account temporarily frozen." msgstr "" +"Þó hefur komið fyrir á liðnum árum að einhverjir hafa lent í því að geta " +"ekki klárað gjafaferlið, og einn aðili lenti í því að PayPal-aðgangurinn " +"hans var frystur tímabundið." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:308 msgid "If you run into any problems donating via PayPal, please let us know." @@ -1334,6 +1352,9 @@ msgid "" "Discover or American Express) or via PayPal, please visit our <a " "href=\"https://donate.torproject.org\">donate page</a>." msgstr "" +"Til að styrkja með helstu kredit- epa debit- greiðslukortumk (VISA, " +"MasterCard, Discover eða American Express) eða í gegnum PayPal, ættirðu að " +"skoða <a href=\"https://donate.torproject.org\">styrkjasíðuna okkar</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:324 msgid "Why do you ask for my address and similar information?" @@ -1651,6 +1672,8 @@ msgid "" "If you want help figuring out the process, write us at giving(at)torproject.org</a>." msgstr "" +"Ef þú vilt að við hjálpum þér við að finna út rétt ferli, þá er bara að " +"senda okkur póst á giving(hjá)torproject.org</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:512 msgid "Can I become a Tor Project member?" @@ -1661,6 +1684,8 @@ msgid "" "Right now, we don't have a membership program, but we may set one up in the " "future." msgstr "" +"Þessa stundina erum við ekki með neitt kerfi yfir aðild meðlima, en í " +"framtíðinni er vel mögulegt að slíku verði komið á." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:518 msgid "" @@ -1669,6 +1694,10 @@ msgid "" "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">this is a " "good place to start</a>." msgstr "" +"Ef þú hefur áhuga á að taka þátt í Tor-verkefninu, þá er <a " +"class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://www.torproject.org/getinvolved/volunteer.html.en\">þetta " +"góður staður til að byrja á</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:524 msgid "How can I get a Tor t-shirt or stickers?" @@ -1680,12 +1709,17 @@ msgid "" "stickers, are presented on our main <a " "href=\"https://donate.torproject.org\">donation page</a>." msgstr "" +"Úrval þakkargjafa fyrir styrktaraðila, meðal annars stuttermabolir, " +"hettupeysur og límmiðar, eru kynntar á <a " +"href=\"https://donate.torproject.org\">styrkjasíðunni okkar</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:534 msgid "" "If I want to stay in touch with the Tor Project, what's the best way for me " "to do that?" msgstr "" +"Ef mig langar til að fylgjast með Tor-verkefninu, hvaða leið er best til " +"þess?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:538 msgid "" @@ -1696,6 +1730,12 @@ msgid "" " links\" target=\"_blank\" href=\"https://twitter.com/torproject\">follow us" " on Twitter</a>." msgstr "" +"Þú getur gerst áskrifandi að <a class=\"hyperlinks links\" target=\"_blank\"" +" href=\"https://newsletter.torproject.org/\">fréttabréfi Tor</a>, lesið " +"reglulega <a class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://blog.torproject.org/\">Tor-bloggið</a>, eða <a " +"class=\"hyperlinks links\" target=\"_blank\" " +"href=\"https://twitter.com/torproject\">fylgst með okkur á Twitter</a>." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:544 msgid "" @@ -1721,6 +1761,8 @@ msgid "" "We would like to accept your miles, vouchers and hotel points, and in the " "future we may be able to." msgstr "" +"Við myndum gjarnan vilja getað tekið við flugpunktum, afsláttarmiðum eða " +"hótelafsláttum frá þér, og slíkt gæti orðið mögulegt í framtíðinni." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:568 msgid "Can I donate hardware?" @@ -1729,6 +1771,7 @@ msgstr "Get ég gefið einhvern vélbúnað?" #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:572 msgid "Typically no, we don't encourage people to donate hardware." msgstr "" +"Venjulega ekki, við erum ekki að hvetja fólk til að gefa okkur vélbúnað." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:574 msgid "" @@ -1736,6 +1779,9 @@ msgid "" "especially useful for us, please mail giving(at)torproject.org." msgstr "" +"En ef þú ert með einhver tæki sem þú heldur að komi sér sérstaklega vel " +"fyrir okkur að eiga, þá geturðu sent okkur póst á giving(hjá)torproject.org." #: tmp/cache_locale/0e/0e65c68f2900f432bc062864e7bafc989d6286e272f5e98882a99f52ea4c5c89.php:580 msgid "Can I donate my time?"

1 0

[tpo/master] Update to press model
by hiro＠torproject.org 27 Mar '19

27 Mar '19

commit bf7cf5d62f3ee63e89bfc14ce5becb4c96c3b950 Author: hiro <hiro(a)torproject.org> Date: Wed Mar 27 10:40:53 2019 +0100 Update to press model --- models/press.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/press.ini b/models/press.ini index 0f6af59..c3c4dca 100644 --- a/models/press.ini +++ b/models/press.ini @@ -1,8 +1,8 @@ [model] name = Press label = {{ this.title }} -hidden = no discoverable = yes +hidden = no [fields.title] label = Title

1 0