April 2018 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'dgoulet/ticket25515_034_01-squashed'
by dgoulet＠torproject.org 26 Apr '18

26 Apr '18

commit 7b09282dc723381e68fef79c3474a56315a0edfa Merge: 33cba1195 f4ad30448 Author: David Goulet <dgoulet(a)torproject.org> Date: Thu Apr 26 11:38:15 2018 -0400 Merge remote-tracking branch 'dgoulet/ticket25515_034_01-squashed' src/test/geoip_dummy | 0 src/test/test_geoip.c | 84 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+)

1 0

[tor/master] Recover newline at the EOF, removed by mistake
by dgoulet＠torproject.org 26 Apr '18

26 Apr '18

commit f4ad30448ab419de2163b42c5447b51867042734 Author: juga0 <juga(a)riseup.net> Date: Tue Apr 24 11:27:11 2018 +0000 Recover newline at the EOF, removed by mistake in 071236e3e252fd0dcf5102739adecb8e69a76c4c. --- src/test/test_geoip.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_geoip.c b/src/test/test_geoip.c index 302af8577..0711a113e 100644 --- a/src/test/test_geoip.c +++ b/src/test/test_geoip.c @@ -546,3 +546,4 @@ struct testcase_t geoip_tests[] = { END_OF_TESTCASES }; +

1 0

[tor/master] Remove a blank line that was bothering me.
by nickm＠torproject.org 26 Apr '18

26 Apr '18

commit 33cba1195bb33c7551f89cdf88e11b7a8787ce68 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 26 09:10:58 2018 -0400 Remove a blank line that was bothering me. --- src/or/connection.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index 389199f18..de0f0485b 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -3686,7 +3686,6 @@ connection_outbuf_too_full(connection_t *conn) * This should help fix slow upload rates. */ static void - update_send_buffer_size(tor_socket_t sock) { #ifdef _WIN32

1 0

[metrics-web/master] Comment out OOI link.
by karsten＠torproject.org 26 Apr '18

26 Apr '18

commit 1ac237e113434ca5beb4d0dc88a496a3f0a1c8bf Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Apr 26 14:39:51 2018 +0200 Comment out OOI link. This is a temporary measure to address #25926. --- src/main/resources/web/json/metrics.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/json/metrics.json b/src/main/resources/web/json/metrics.json index 0739b88..7f04cb6 100644 --- a/src/main/resources/web/json/metrics.json +++ b/src/main/resources/web/json/metrics.json @@ -279,7 +279,7 @@ "id": "oxford-anonymous-internet", "title": "“The anonymous Internet”", "type": "Link", - "description": "The Oxford Internet Institute made a cartogram visualization of Tor users as compared to the overall Internet population. They used the average number of Tor <a href=\"glossary.html#client\">users</a> per country from August 2012 to August 2013 and put it in relation to total Internet users per country. More details and conclusions can be found on the <a href=\"http://geography.oii.ox.ac.uk/?page=tor\" target=\"_blank\">Information Geographies website at the Oxford Internet Institute</a>.<a href=\"http://geography.oii.ox.ac.uk/?page=tor\"><img src=\"images/oxford-anonymous-internet.png\" alt=\"The anonymous Internet\"></a>" + "description": "The Oxford Internet Institute made a cartogram visualization of Tor users as compared to the overall Internet population. They used the average number of Tor <a href=\"glossary.html#client\">users</a> per country from August 2012 to August 2013 and put it in relation to total Internet users per country. <img src=\"images/oxford-anonymous-internet.png\" alt=\"The anonymous Internet\">" }, { "id": "torperf",

1 0

[metrics-web/master] Fix typo on Statistics page.
by karsten＠torproject.org 26 Apr '18

26 Apr '18

commit 215f3639c245a4ed200158526bf03b3d07f25677 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Apr 23 12:41:29 2018 +0200 Fix typo on Statistics page. --- src/main/resources/web/jsps/stats.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/web/jsps/stats.jsp b/src/main/resources/web/jsps/stats.jsp index c224a06..2674ba0 100644 --- a/src/main/resources/web/jsps/stats.jsp +++ b/src/main/resources/web/jsps/stats.jsp @@ -452,7 +452,7 @@ uni-/bidirectional connection usage were reported.</li> <li>direction: Direction of reported fraction, which can be "read", "write", or "both" for connections classified as -"mostly reading", "mostly writing", or "both reading as writing". Connections +"mostly reading", "mostly writing", or "both reading and writing". Connections below the threshold have been removed from this statistics file entirely.</li> <li>quantile: Quantile of the reported fraction when considering all

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 26 Apr '18

26 Apr '18

commit 37e3a4e9cc20194bbcd410dff4d9650d5202c523 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 26 09:45:41 2018 +0000 Update translations for liveusb-creator --- ja/ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index f7481f254..5982c2fcb 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -19,7 +19,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-04-26 09:13+0000\n" +"PO-Revision-Date: 2018-04-26 09:34+0000\n" "Last-Translator: TEN CO <jpnanon0311(a)protonmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" @@ -449,7 +449,7 @@ msgstr "%(filename)sが選択されました" #: ../tails_installer/source.py:28 msgid "Unable to find LiveOS on ISO" -msgstr "" +msgstr "ISO上でLiveOSを見つけられません" #: ../tails_installer/source.py:34 #, python-format @@ -500,15 +500,15 @@ msgstr "" #: ../data/tails-installer.ui.h:3 msgid "Use a downloaded Tails ISO image" -msgstr "" +msgstr "ダウンロードしたTails ISOイメージを使用する" #: ../data/tails-installer.ui.h:4 msgid "Select a distribution to download:" -msgstr "" +msgstr "ダウンロードするディストリビューションを選択：" #: ../data/tails-installer.ui.h:5 msgid "Target USB stick:" -msgstr "" +msgstr "ターゲットUSBスティック" #: ../data/tails-installer.ui.h:6 msgid "Reinstall (delete all data)"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 26 Apr '18

26 Apr '18

commit c896ff18b7a4cdcf0ca826de6225cea30dd1b924 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 26 09:15:42 2018 +0000 Update translations for liveusb-creator --- ja/ja.po | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index ad0d6e077..f7481f254 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -11,6 +11,7 @@ # hyuugabaru <hyu_gabaru(a)yahoo.co.jp>, 2009 # タカハシ <indexial(a)outlook.jp>, 2015 # taka F <m465c3iiwrih(a)gmail.com>, 2013 +# TEN CO <jpnanon0311(a)protonmail.com>, 2018 # Tokumei Nanashi, 2015 # 藤前　甲 <m1440809437(a)hiru-dea.com>, 2014 msgid "" @@ -18,8 +19,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-11-10 15:57+0100\n" -"PO-Revision-Date: 2018-03-25 07:54+0000\n" -"Last-Translator: 987 pluto <pluto987(a)protonmail.com>\n" +"PO-Revision-Date: 2018-04-26 09:13+0000\n" +"Last-Translator: TEN CO <jpnanon0311(a)protonmail.com>\n" "Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -218,7 +219,7 @@ msgstr "%(device)sをFAT32としてフォーマット中" #: ../tails_installer/creator.py:1249 msgid "Could not find syslinux' gptmbr.bin" -msgstr "" +msgstr "syslinuxのgptmbr.binが見つかりませんでした" #: ../tails_installer/creator.py:1262 #, python-format @@ -306,7 +307,7 @@ msgstr "インストール完了！ (%s)" #: ../tails_installer/gui.py:263 msgid "Tails installation failed!" -msgstr "" +msgstr "Tailsのインストールに失敗！" #: ../tails_installer/gui.py:363 msgid "" @@ -334,15 +335,15 @@ msgstr "" #: ../tails_installer/gui.py:481 msgid "No ISO image selected" -msgstr "" +msgstr "ISOイメージが選択されていません" #: ../tails_installer/gui.py:482 msgid "Please select a Tails ISO image." -msgstr "" +msgstr "Tails ISOイメージを選択してください。" #: ../tails_installer/gui.py:521 msgid "No device suitable to install Tails could be found" -msgstr "" +msgstr "Talisを設置するのに適した装置が見つかりませんでした" #: ../tails_installer/gui.py:523 #, python-format @@ -390,7 +391,7 @@ msgstr "デバイスをマウントできません" #: ../tails_installer/gui.py:705 ../tails_installer/gui.py:735 msgid "Confirm the target USB stick" -msgstr "" +msgstr "目標USBスティックを確認する" #: ../tails_installer/gui.py:706 #, python-format

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 26 Apr '18

26 Apr '18

commit 28504495bd5236a0cc9f7ef3da50afbf5677a470 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 26 08:49:27 2018 +0000 Update translations for tails-greeter-2 --- ja/ja.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index 7f000aafe..ba8f8cf1e 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -109,11 +109,11 @@ msgstr "" #: ../data/greeter.ui.h:23 msgid "Default Settings" -msgstr "" +msgstr "デフォルト設定" #: ../data/greeter.ui.h:24 msgid "Save Language & Region Settings" -msgstr "" +msgstr "言語と領域の設定を保存する" #: ../data/greeter.ui.h:25 msgid "_Language" @@ -247,7 +247,7 @@ msgstr "アンロック..." #: ../tailsgreeter/gui.py:594 msgid "Additional Settings" -msgstr "" +msgstr "追加の設定" #: ../tailsgreeter/gui.py:602 msgid "Cancel"

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 26 Apr '18

26 Apr '18

commit 68e3a936d7f3a254382a6b180d9e2b76490260e9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 26 08:19:35 2018 +0000 Update translations for tails-greeter-2 --- ja/ja.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ja/ja.po b/ja/ja.po index c7ea08325..7f000aafe 100644 --- a/ja/ja.po +++ b/ja/ja.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-01 20:26+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: anon owl <kinguri12(a)icloud.com>, 2018\n" +"Last-Translator: TEN CO <jpnanon0311(a)protonmail.com>, 2018\n" "Language-Team: Japanese (https://www.transifex.com/otf/teams/1519/ja/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -39,7 +39,7 @@ msgstr "確定" #: ../data/greeter.ui.h:5 msgid "Confirm your administration password" -msgstr "" +msgstr "管理パスワードを確認する" #: ../data/greeter.ui.h:6 msgid "Disable"

1 0

[doctor/master] Use stem descriptor downloader for health check
by atagar＠torproject.org 25 Apr '18

25 Apr '18

commit df504cd1b96c15f9f09623f8baff1966ee9b3a7c Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Apr 25 12:38:54 2018 -0700 Use stem descriptor downloader for health check Now that Stem can download descriptors from an ORPort this health check can be quite a bit nicer. --- relay_check.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/relay_check.py b/relay_check.py index 2a40179..140ca01 100755 --- a/relay_check.py +++ b/relay_check.py @@ -4,14 +4,14 @@ """ Health checks for your relay. This provides a simple email notification when -your relay has become unavailable. +your relay becomes unavailable. """ import smtplib import traceback import stem -import stem.client +import stem.descriptor.remote from email.mime.multipart import MIMEMultipart from email.mime.text import MIMEText @@ -27,14 +27,12 @@ RELAY_LINK = 'https://metrics.torproject.org/rs.html#details/%s' % RELAY_FINGERP def main(): try: - with stem.client.Relay.connect(RELAY_ADDRESS, RELAY_OR_PORT, [3]) as relay: - circ = relay.create_circuit() - circ.send('RELAY_BEGIN_DIR', stream_id = 1) - our_descriptor = circ.send('RELAY_DATA', 'GET /tor/server/authority HTTP/1.0\r\n\r\n', stream_id = 1).data - circ.close() - - if 'router %s %s %s' % (RELAY_NAME, RELAY_ADDRESS, RELAY_OR_PORT) not in our_descriptor: - email('Unable to fetch %s descriptor' % RELAY_NAME, "Unable to retrieve the descriptor of %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, our_descriptor)) + desc = list(stem.descriptor.remote.their_server_descriptor( + endpoints = [stem.ORPort(RELAY_ADDRESS, RELAY_OR_PORT)], + ))[0] + + if desc.nickname != RELAY_NAME: + raise ValueError('Unexpected descriptor:\n\n%s' % desc) except stem.SocketError: email('Unable to reach %s' % RELAY_NAME, "Unable to reach %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, traceback.format_exc())) @@ -56,7 +54,7 @@ def email(subject, body): msg.attach(MIMEText(body, 'plain')) server = smtplib.SMTP('localhost') - server.sendmail(FROM_ADDRESS, destinations, msg.as_string()) + server.sendmail('no-rely(a)torproject.com', [EMAIL_ADDRESS], msg.as_string()) server.quit()

1 0