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

[translation/support-gettor] Update translations for support-gettor
by translation＠torproject.org 17 May '18

17 May '18

commit 5dd0e22c1adefa1614d32a810d9a5a105056fb6d Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 13:49:27 2018 +0000 Update translations for support-gettor --- fa.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fa.json b/fa.json index 1f4c42c72..1c9e98a97 100644 --- a/fa.json +++ b/fa.json @@ -2,8 +2,8 @@ "gettor-1": { "id": "#gettor-1", "control": "gettor-1", - "title": "How do I download Tor if the torproject.org is blocked?", - "description": "If you can't download Tor through our <a href=\"https://www.torproject.org\">website</a>, you can get a copy of Tor delivered to you via GetTor. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations that are less likely to be censored, such as Dropbox, Google Drive, and Github." + "title": "اگر torproject.org مسدود باشد، چگونه Tor را دانلود کنم؟", + "description": "اگر قادر به دانلود Tor از طریق <a href=\"https://www.torproject.org\">وبسایت</a> ما نیستید، می‌توانید گرفتن Tor را با استفاده از سرویس «دانلود Tor» یا GetTor انجام دهید. GetTor سرویسی است که به صورت اتوماتیک به پیام‌ها، آخرین نسخه مرورگر Tor را که در مکان‌هایی که کمتر مسدود می‌شوند، مانند Dropbox، Google Drive و Github ارسال می‌کنند." }, "gettor-2": { "id": "#gettor-2",

1 0

[translation/support-faq] Update translations for support-faq
by translation＠torproject.org 17 May '18

17 May '18

commit 58462bacda67dce77b61cd170503046f9f2d3219 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 13:49:19 2018 +0000 Update translations for support-faq --- fa.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fa.json b/fa.json index a4a631779..57c56f899 100644 --- a/fa.json +++ b/fa.json @@ -8,7 +8,7 @@ "faq-2": { "id": "#faq-2", "control": "faq-2", - "title": "Our website is blocked by a censor. Can Tor Browser help users access our website?", + "title": "سایت ما به قصد سانسور، مسدود شده است. آیا مرورگر تور می‌تواند به کاربران در دسترسی به سایت ما کمک کند؟", "description": "Tor Browser can certainly help people access your website in places where it is blocked. Most of the time, simply downloading the Tor Browser and then using it to navigate to the blocked site will allow access. In places where there is heavy censorship, we have a number of censorship circumvention options available, including pluggable transports. For more information, please see the Tor Browser User Manual section on censorship." }, "faq-3": {

1 0

[translation/support-censorship] Update translations for support-censorship
by translation＠torproject.org 17 May '18

17 May '18

commit af27ff600d1870366b28c961655559b81d158e42 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 17 13:49:04 2018 +0000 Update translations for support-censorship --- fa.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/fa.json b/fa.json index 9abeb2f10..06d69cc97 100644 --- a/fa.json +++ b/fa.json @@ -2,25 +2,25 @@ "censorship-1": { "id": "#censorship-1", "control": "censorship-1", - "title": "Our website is blocked by a censor. Can Tor Browser help users access our website?", - "description": "Tor Browser can certainly help people access your website in places where it is blocked. Most of the time, simply downloading the â<a href=\"https://www.torproject.org/download/download-easy.html.en\">Tor Browser</a> and then using it to navigate to the blocked site will allow access. In places where there is heavy censorship we have a number of censorship circumvention options available, including â<a href=\"https://www.torproject.org/docs/pluggable-transports.html.en\">pluggable transports</a>. For more information, please see the <a href=\"https://tb-manual.torproject.org/en-US/\">âTor Browser User Manual</a> section on <a href=\"https://tb-manual.torproject.org/en-US/circumvention.html\">censorship</a>." + "title": "Ø³Ø§ÛØª ÙØ§ ØšÙ ÙØµØ¯ Ø³Ø§ÙØ³ÙØ±Ø ÙØ³Ø¯ÙØ¯ ØŽØ¯Ù Ø§Ø³Øª. Ø¢ÛØ§ ÙØ±ÙØ±Ú¯Ø± ØªÙØ± ÙÛâØªÙØ§ÙØ¯ ØšÙ Ú©Ø§Ø±ØšØ±Ø§Ù Ø¯Ø± Ø¯Ø³ØªØ±Ø³Û ØšÙ ÙØšØ³Ø§ÛØª ÙØ§ Ú©ÙÚ© Ú©ÙØ¯Ø", + "description": "ÙØ±ÙØ±Ú¯Ø± Tor ÙÛâØªÙØ§ÙØ¯ ØšÙ Ú©Ø§Ø±ØšØ±Ø§Ù Ú©ÙÚ© Ú©ÙØ¯ Ú©Ù ØšÙ ÙØšØ³Ø§ÛØª ÙØ³Ø¯ÙØ¯ ØŽØ¯Ù ØŽÙØ§ Ø¯Ø³ØªØ±Ø³Û ÙŸÛØ¯Ø§ Ú©ÙÙØ¯. ÙØ¹ÙÙÙØ§ Ø¯Ø§ÙÙÙØ¯ Ú©Ø±Ø¯Ù <a href=\"https://www.torproject.org/download/download-easy.html.en\">ÙØ±ÙØ±Ú¯Ø± Tor</a> Ù Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø¢Ù ØšØ±Ø§Û ØšØ§Ø² Ú©Ø±Ø¯Ù Ø³Ø§ÛØª ÙØ³Ø¯ÙØ¯Ø Ø§Ø¬Ø§Ø²Ù Ø¯Ø§Ø¯Ù Ø¯Ø³ØªØ±Ø³Û Ø±Ø§ ÙØÛØ§ ÙÛâÚ©ÙØ¯.\nØ¯Ø± ÙÙÚ¯Ø§Ù Ø³Ø§ÙØ³ÙØ± ØšØ³ÛØ§Ø± ØŽØ¯ÛØ¯Ø Ø±ÙØŽâÙØ§ÛÛ ØšØ±Ø§Û Ø¯ÙØ± Ø²Ø¯Ù Ø³Ø§ÙØ³ÙØ± Ø¯Ø± Ø¯Ø³ØªØ±Ø³ ÙØ³ØªÙØ¯. ÙØ§ÙÙØ¯ <a href=\"https://www.torproject.org/docs/pluggable-transports.html.en\">ÙÙÙ Ù Ø§ÙØªÙØ§Ù ÙØ§ØšÙ Ø¬Ø§ØšØ¬Ø§ÛÛ</a>. ØšØ±Ø§Û Ø§Ø·ÙØ§Ø¹Ø§Øª ØšÛØŽØªØ±Ø ÙØ·ÙØ§ <a href=\"https://tb-manual.torproject.org/en-US/\">Ø±Ø§ÙÙÙØ§Û Ú©Ø§Ø±ØšØ±Û ÙØ±ÙØ±Ú¯Ø± Tor</a> Ù ØšØ®ØŽ <a href=\"https://tb-manual.torproject.org/en-US/circumvention.html\">Ø³Ø§ÙØ³ ÙØ±</a> Ø±Ø§ ÙØ·Ø§ÙØ¹Ù Ú©ÙÛØ¯." }, "censorship-2": { "id": "#censorship-2", "control": "censorship-2", - "title": "My favorite website is blocking access over Tor.", - "description": "Sorry to hear that you can't visit the website you wanted! Sometimes websites will block Tor users because they can't tell the difference between the average Tor user and automated traffic. The best success we've had in getting sites to unblock Tor users is getting users to contact the site administrators directly. Something like this might do the trick: \"Hi! I tried to access your site xyz.com while using Tor Browser and discovered that you don't allow Tor users to access your site. I urge you to reconsider this decision; Tor is used by people all over the world to protect their privacy and fight censorship. By blocking Tor users, you are likely blocking people in repressive countries who want to use a free internet, journalists and researchers who want to protect themselves from discovery, whistleblowers, activists, and ordinary people who want to opt out of invasive third party tracking. Please take a strong stance in favor of digital priv acy and internet freedom, and allow Tor users access to xyz.com. Thank you.\" In the case of banks, and other sensitive websites, it is also common to see geography-based blocking (if a bank knows you generally access their services from one country, and suddenly you are connecting from an exit relay on the other side of the world, your account may be locked or suspended). If you are unable to connect to an onion service, please see <a href=\"#onionservices-3\">I cannot reach X.onion!</a>" + "title": "ÙØšØ³Ø§ÛØª ÙÙØ±Ø¯ Ø¹ÙØ§ÙÙ ÙÙ Ø¯Ø³ØªØ±Ø³Û ØšØ§ Tor Ø±Ø§ ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù Ø§Ø³Øª.", + "description": "Ø§Ø² ØŽÙÛØ¯Ù Ø§ÛÙ Ú©Ù ÙØªÙØ§ÙØ³ØªÛØ¯ ÙØšØ³Ø§ÛØª ÙÙØ±Ø¯ Ø¹ÙØ§ÙÙ Ø®ÙØ¯ Ø±Ø§ ØšØ§Ø² Ú©ÙÛØ¯Ø ÙØªØ§Ø³ÙÛÙ! ØšØ¹Ø¶Ø§ Ø³Ø§ÛØªâÙØ§ Ú©Ø§Ø±ØšØ±Ø§Ù Tor Ø±Ø§ ØšÙ Ø¯ÙÛÙ Ø§ÛÙ Ú©Ù ÙØ§Ø¯Ø± ØšÙ ØªÙØ§ÛØ² ØšÛÙ Ú©Ø§Ø±ØšØ± Tor Ù ØšØ§Ø²Ø¯ÛØ¯ Ø§ØªÙÙØ§ØªÛÚ© ÙÛØ³ØªÙØ¯Ø ÙØ³Ø¯ÙØ¯ ÙÛâÚ©ÙÙØ¯. ØšÙØªØ±ÛÙ Ø±Ø§ÙÚ©Ø§Ø± Ø±ÙØ¹ Ø§ÛÙ ÙØŽÚ©Ù Ø§ÛÙ Ø§Ø³Øª Ú©Ù Ú©Ø§Ø±ØšØ±Ø§Ù Tor ØšØ§ ÙØ¯ÛØ± Ø³Ø§ÛØª ØªÙØ§Ø³ ÙŸÛØ¯Ø§ Ú©ÙÙØ¯. Ú¯Ø§ÙØ§ ÚÙÛÙ ÙŸÛØ§ÙÛ ÙÛâØªÙØ§ÙØ¯ Ú©ÙÚ© Ú©ÙØ¯:\n Â«Ø³ÙØ§Ù! ÙÙ Ø³Ø¹Û Ú©Ø±Ø¯Ù ØšÙ Ø³Ø§ÛØª ØŽÙØ§ zyx.com ØšØ§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² ÙØ±ÙØ±Ú¯Ø± Tor Ø¯Ø³ØªØ±Ø³Û ÙŸÛØ¯Ø§ Ú©ÙÙ Ù ÙØªÙØ¬Ù ØŽØ¯Ù Ú©Ù Ø§Ø¬Ø§Ø²Ù Ø¯Ø§Ø¯Ù ØšÙ Ú©Ø§Ø±ØšØ±Ø§Ù Tor ØšÙ Ø³Ø§ÛØª ØŽÙØ§ ÙØ³Ø¯ÙØ¯ ØŽØ¯Ù. ÙŸÛØŽÙÙØ§Ø¯ ÙÛâÚ©ÙÙ Ø¯Ø± ØªØµÙÛÙØªØ§Ù ØªØ¬Ø¯ÛØ¯ ÙØžØ± Ú©ÙÛØ¯. Tor ØªÙØ³Ø· Ú©Ø§Ø±ØšØ±Ø§Ù Ø¯Ø± Ø³Ø±Ø§Ø³Ø± Ø¯ÙÛØ§ ØšØ±Ø§Û ØÙØž ØØ±ÛÙ Ø®ØµÙØµÛ Ù ÙØšØ§Ø±Ø²Ù ØšØ § Ø³Ø§ÙØ³ÙØ± Ø§Ø³ØªÙØ§Ø¯Ù ÙÛâØŽÙØ¯. ØšØ§ ÙØ³Ø¯ÙØ¯ Ú©Ø±Ø¯Ù Ú©Ø§Ø±ØšØ±Ø§Ù TorØ ØŽÙØ§ Ø¯Ø³ØªØ±Ø³Û ÙØ±Ø¯Ù Ø¯Ø± Ø§ÛÙ Ú©ØŽÙØ±ÙØ§ Ø±Ø§ ØšÙ Ø§ÛÙØªØ±ÙØª Ø¢Ø²Ø§Ø¯Ø ÚÙØ±ÙØ§ÙÛØ³ØªâÙØ§ Ù ÙØÙÙÛÙÛ Ú©Ù ÙØµØ¯ ØÙØ§ØžØª Ø§Ø² Ø®ÙØ¯ Ø±Ø§ Ø¯Ø§Ø±ÙØ¯Ø Ø§ÙØŽØ§Ú¯Ø±ÙØ§ Ù ÙØ¹Ø§ÙÛÙ ÙØ¯ÙÛ Ù ÙØ±Ø¯Ù Ø¹Ø§Ø¯Û Ú©Ù ÙØµØ¯ ØÙØ§ØžØª Ø§Ø² Ø¯ÙØšØ§Ù ØŽØ¯Ù ØªÙØ³Ø· Ø§ØŽØ®Ø§Øµ Ø«Ø§ÙØ« Ø±Ø§ Ø¯Ø§Ø±ÙØ¯ Ø±Ø§ ÙØØ¯ÙØ¯ ÙÛâÚ©ÙÛØ¯. ÙØ·ÙØ§ ØŽÙØ§ ÙÙ ØšØ±Ø§Û ØÙØž ØØ±ÛÙ Ø®ØµÙØµÛ Ù Ø§ÛÙØªØ±ÙØª Ø¢Ø²Ø§Ø¯ ØªÙØ§ØŽ Ú©ÙÛØ¯ Ù Ø¯Ø³ØªØ±Ø³Û Ú©Ø§Ø±ØšØ±Ø§Ù Tor ØšÙ Ø³Ø§ÛØªØªØ§Ù Ø±Ø§ Ø¢Ø²Ø§Ø¯ Ú©ÙÛØ¯. ØšØ§ ØªØŽÚ©Ø±.Â» Ø¯Ø± Ø®ØµÙØµ ØšØ§ÙÚ©âÙØ§ Ù Ø³Ø§ÛØ± ÙØšØ³Ø§ÛØªâÙØ§Û ØØ³Ø§Ø³Ø ÙØ³Ø¯ÙØ¯ØŽØ¯Ù ØšØ± Ø§Ø³Ø§Ø³ ÙÙØ·ÙÙ Ø¬ØºØ±Ø§ÙÛØ§ÛÛ Ø±Ø§ÛØ¬ Ø§Ø³Øª (Ø§Ú¯Ø± ØšØ§ÙÚ© ÙÛââØ¯Ø§ÙØ¯ Ú©Ù Ø¹ÙÙÙØ§ Ø§Ø² ÚÙ Ú©ØŽÙØ±Û Ø§Ø² Ø³Ø±ÙÛØ³ØŽØ§Ù Ø§Ø³ØªÙØ§Ø¯Ù ÙÛâÚ©ÙÛØ¯ Ù ÙØ§Ú¯ÙØ§Ù Ø§Ø² Ø±ÙÙ Ø®Ø±ÙØ¬ Ø¯Ø± Ú©ØŽÙØ± Ø¯ÛÚ¯Ø± ØšÙ ØØ³Ø§Øš Ú©Ø§Ø±ØšØ±Û Ø®ÙØ¯ ÙØªØµÙ ØŽÙÛØ¯Ø ÙÙÚ©Ù Ø§Ø² ØŽÙØ§ Ø±Ø§ ÙÙÙ ÛØ§ ÙØ³Ø¯ÙØ¯ Ú©ÙÙØ¯). Ø¯Ø± ØµÙØ±ØªÛ Ú©Ù ÙØ§Ø¯Ø± ØšÙ Ø§ØªØµØ§Ù ØšÙ Ø³Ø±ÙÛØ³ Onion ÙÛØ³ØªÛØ¯Ø ÙØ·ÙØ§ <a href=\"#onionservices-3\">ÙÙÛâØªÙØ§ÙÙ ØšÙ X.onion Ø¯Ø³ØªØ±Ø³Û ÙŸÛØ¯Ø§ Ú©ÙÙ!</a> Ø±Ø§ ÙØ·Ø§ÙØ¹Ù Ú©ÙÛØ¯." }, "censorship-3": { "id": "#censorship-3", "control": "censorship-3", - "title": "How do I download Tor if the torproject.org is blocked?", - "description": "If you can't download Tor through our â<a href=\"https://www.torproject.org\">website</a>, you can get a copy of Tor delivered to you via GetTor. GetTor is a service that automatically responds to messages with links to the latest version of Tor Browser, hosted at a variety of locations that are less likely to be censored, such as Dropbox, Google Drive, and Github." + "title": "Ø§Ú¯Ø± torproject.org ÙØ³Ø¯ÙØ¯ ØšØ§ØŽØ¯Ø ÚÚ¯ÙÙÙ Tor Ø±Ø§ Ø¯Ø§ÙÙÙØ¯ Ú©ÙÙØ", + "description": "Ø§Ú¯Ø± ÙØ§Ø¯Ø± ØšÙ Ø¯Ø§ÙÙÙØ¯ Tor Ø§Ø² Ø·Ø±ÛÙ <a href=\"https://www.torproject.org\">ÙØšØ³Ø§ÛØª</a> ÙØ§ ÙÛØ³ØªÛØ¯Ø ÙÛâØªÙØ§ÙÛØ¯ Ú¯Ø±ÙØªÙ Tor Ø±Ø§ ØšØ§ Ø§Ø³ØªÙØ§Ø¯Ù Ø§Ø² Ø³Ø±ÙÛØ³ Â«Ø¯Ø§ÙÙÙØ¯ TorÂ» ÛØ§ GetTor Ø§ÙØ¬Ø§Ù Ø¯ÙÛØ¯. GetTor Ø³Ø±ÙÛØ³Û Ø§Ø³Øª Ú©Ù ØšÙ ØµÙØ±Øª Ø§ØªÙÙØ§ØªÛÚ© ØšÙ ÙŸÛØ§ÙâÙØ§Ø Ø¢Ø®Ø±ÛÙ ÙØ³Ø®Ù ÙØ±ÙØ±Ú¯Ø± Tor Ø±Ø§ Ú©Ù Ø¯Ø± ÙÚ©Ø§ÙâÙØ§ÛÛ Ú©Ù Ú©ÙØªØ± ÙØ³Ø¯ÙØ¯ ÙÛâØŽÙÙØ¯Ø ÙØ§ÙÙØ¯ DropboxØ Google Drive Ù Github Ø§Ø±Ø³Ø§Ù ÙÛâÚ©ÙÙØ¯." }, "censorship-4": { "id": "#censorship-4", "control": "censorship-4", - "title": "I canât connect to Tor Browser, is my network censored?", + "title": "ÙÙÛâØªÙØ§ÙÙ ØšÙ ÙØ±ÙØ±Ú¯Ø± Tor Ø¯Ø³ØªØ±Ø³Û ÙŸÛØ¯Ø§ Ú©ÙÙØ Ø¢ÛØ§ ØŽØšÚ©Ù ÙÙ Ø³Ø§ÙØ³ÙØ± ØŽØ¯Ù Ø§Ø³ØªØ", "description": "You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our â<a href=\"https://bridges.torproject.org/\">Bridges website</a>. For more information about bridges, see the <a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">âTor Browser manual</a>." }, "censorship-5": { @@ -32,7 +32,7 @@ "censorship-6": { "id": "#censorship-6", "control": "censorship-6", - "title": "I canât connect to Tor Browser, is my network censored?", + "title": "ÙÙÛâØªÙØ§ÙÙ ØšÙ ÙØ±ÙØ±Ú¯Ø± Tor Ø¯Ø³ØªØ±Ø³Û ÙŸÛØ¯Ø§ Ú©ÙÙØ Ø¢ÛØ§ ØŽØšÚ©Ù ÙÙ Ø³Ø§ÙØ³ÙØ± ØŽØ¯Ù Ø§Ø³ØªØ", "description": "You might be on a censored network, and so you should try using bridges. Some bridges are built in to Tor Browser, and you can use those bridges by choosing \"configure\" (then following the prompts) in the Tor Launcher window that pops up when you open Tor Browser for the first time. If you need other bridges, you can get them at our â<a href=\"https://bridges.torproject.org/\">Bridges website</a>. For more information about bridges, see the <a href=\"https://tb-manual.torproject.org/en-US/bridges.html\">âTor Browser manual</a>." }

1 0

[tor/master] bump to 0.3.4.1-alpha-dev
by nickm＠torproject.org 17 May '18

17 May '18

commit 3b42b14979f1803eb32c671cb99120c722aff065 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 17 09:44:31 2018 -0400 bump to 0.3.4.1-alpha-dev --- configure.ac | 2 +- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 928968531..3b1a6c008 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2017, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.3.4.1-alpha]) +AC_INIT([tor],[0.3.4.1-alpha-dev]) AC_CONFIG_SRCDIR([src/or/main.c]) AC_CONFIG_MACRO_DIR([m4]) diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index fa9b6eb64..bd1761f88 100644 --- a/contrib/win32build/tor-mingw.nsi.in +++ b/contrib/win32build/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.3.4.1-alpha" +!define VERSION "0.3.4.1-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index ab95ebf8b..52165a230 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -218,7 +218,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.3.4.1-alpha" +#define VERSION "0.3.4.1-alpha-dev"

1 0

[webwml/master] The latest alpha is now 0.3.4.1-alpha
by nickm＠torproject.org 17 May '18

17 May '18

commit 619dc43ef23d62a684bf0a95be250abe855775c7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 17 09:30:02 2018 -0400 The latest alpha is now 0.3.4.1-alpha --- Makefile | 2 +- include/versions.wmi | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index e212fc0e..a5abcc65 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ # website component, and set it to needs_review. export STABLETAG=tor-0.3.2.10 -export DEVTAG=tor-0.3.3.5-rc +export DEVTAG=tor-0.3.4.1-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate docs/torbutton diff --git a/include/versions.wmi b/include/versions.wmi index 634fb233..82ee70a4 100644 --- a/include/versions.wmi +++ b/include/versions.wmi @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.3.2.10</define-tag> -<define-tag version-alpha whitespace=delete>0.3.3.5-rc</define-tag> +<define-tag version-alpha whitespace=delete>0.3.4.1-alpha</define-tag> <define-tag version-torbrowserdevelopbranch whitespace=delete>maint-7.5</define-tag>

1 0

[tor/master] increment changelog date
by nickm＠torproject.org 17 May '18

17 May '18

commit deb8970a29ef7427c3d42182d3bacc31ab602c03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 17 09:00:49 2018 -0400 increment changelog date --- ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 53ddf4976..89b3f4c83 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.3.4.1-alpha - 2018-05-16 +Changes in version 0.3.4.1-alpha - 2018-05-17 Tor 0.3.4.1-alpha is the first release in the 0.3.4.x series. It includes refactoring to begin reducing Tor's binary size and idle CPU usage on mobile, along with prep work for new bandwidth scanners,

1 0

[webwml/master] Add localization PM job posting
by hiro＠torproject.org 17 May '18

17 May '18

commit 938b5002df60c3fd1bc071936fcceb2f3c9fcf47 Author: hiro <hiro(a)torproject.org> Date: Thu May 17 11:06:31 2018 +0200 Add localization PM job posting --- about/en/jobs-localization-projectmanager.wml | 77 +++++++++++++++++++++++++++ about/en/jobs.wml | 13 +++-- 2 files changed, 83 insertions(+), 7 deletions(-) diff --git a/about/en/jobs-localization-projectmanager.wml b/about/en/jobs-localization-projectmanager.wml new file mode 100644 index 00000000..9ebb7adf --- /dev/null +++ b/about/en/jobs-localization-projectmanager.wml @@ -0,0 +1,77 @@ +## translation metadata +# Revision: $Revision: 25666 $ +# Translation-Priority: 3-low + +#include "head.wmi" TITLE="Tor Project: Jobs (part-time position: localization project manager)" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page about/overview>">About » </a> + <a href="<page about/jobs>">Jobs</a> + </div> + <div id="maincol"> +<h1>Part-time position: Localization Project Manager</h1> +<h2>(Posted 17 May 2018)</h2> + + +Do you care about privacy and internet freedom? Do want to help international users? The Tor Project is currently seeking a part-time Localization Project Manager to work closely with our developers, UX team, and community team to make the Tor Project's website and products easier to understand and navigate for users all over the world. + + +The Tor Project, Inc., is a 501(c)(3) organization headquartered in Seattle that provides the technical infrastructure for privacy protection over the internet, helping millions of activists, journalists and others around the world communicate securely. With paid staff and contractors of around 35 engineers and operational support people, plus many volunteers all over the world who contribute to our work, the Tor Project is funded in part by government grants and contracts, as well as by individual, foundation, and corporate donations. Our mission is “To advance human rights and freedoms by creating and deploying free and open anonymity and privacy technologies, supporting their unrestricted availability and use, and furthering their scientific and popular understanding.” + + +This is a work-from-home position that will report to the Project Manager. + + + +Duties include but are not limited to: + + +<ul> + +<li>Manage/oversee scripts that manage the flow of strings from our sites and products to crowdsourced translation tools, such as Transifex and Weblate.</li> +<li>Manage translation, localization, and QA in collaboration with our community of volunteer translators, while making sure our top tier languages are well represented.</li> +<li>Be the point of contact for our international community of partner organizations and individual translators, provide support as they translate Tor resources, and help encourage new or would-be translators across the world.</li> +<li>Work with internal teams to establish efficient workflows, and continuously improve processes related to the planning and delivery of translations and multilingual content.</li> + +</ul> + + +The ideal person for this job will have the following qualities, skills, and abilities: + + +<ul> + +<li>Excellent written and verbal communication skills in English.</li> +<li>Ability to successfully manage multiple projects simultaneously.</li> +<li>Experience working with open source communities.</li> +<li>Proficiency in UNIX and scripting languages.</li> +<li>Advanced understanding of the end-to-end localization process for software products and/or websites.</li> +<li>Experience with internationalization tools and techniques.</li> +<li>Highly organized and detail oriented; ambitious and self-motivated.</li> +<li>Ability to build and maintain strong collaborative relationships with an international team.</li> +<li>Passionate about delivering an excellent experience to our international users.</li> +<li>Proficiency in/with at least one non-English language strongly preferred.</li> + +</ul> + + +The Tor Project's workforce is smart, passionate, and dedicated. Experience working with open source communities and/or a commitment to internet civil liberties are added pluses for any candidate applying for this position. + + +Flexible pay, depending on experience. The Tor Project has a competitive benefits package, including a generous PTO policy; flexible work schedule; and occasional travel opportunities. The Tor Project, Inc., is an equal opportunity, affirmative action employer. + + +This is a part-time position that can be performed from anywhere. To apply, send a cover letter explaining your qualifications for this job *and* your CV/resume to hr(a)torproject.org with 'Localization Project Manager” in the subject line. No phone calls please! + + + </div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> \ No newline at end of file diff --git a/about/en/jobs.wml b/about/en/jobs.wml index 877e312d..c74613af 100644 --- a/about/en/jobs.wml +++ b/about/en/jobs.wml @@ -12,14 +12,13 @@ <div id="maincol"> <h1>The Tor Project is always looking for more great people to join our team!</h1> - At the moment, we don't have any official open positions. Please check back - soon, though! In the meantime, you may want to glance at our - <a href="<page getinvolved/volunteer>">volunteers</a> page. + # At the moment, we don't have any official open positions. Please check back soon, though! In the meantime, you may want to glance at our + # <a href="<page getinvolved/volunteer>">volunteers</a> page. - #Specifically, we're looking for the following people currently: - #<ul> - # <li><a href="<page about/jobs-useradvocate>">User Advocate (Mozilla fellowship)</a></li> - #</ul> + Specifically, we're looking for the following people currently: + <ul> + <li><a href="<page about/jobs-localization-projectmanager>">Localization Project Manager (Part-time)</a></li> + </ul> In the past, we looked for the following people:

1 0

[tor-launcher/master] Bug 20890: Increase control port connection timeout
by gk＠torproject.org 17 May '18

17 May '18

commit 9aa5fd46cb33528150400a9b94c14ad5e9b7d4ee Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed May 16 14:17:16 2018 -0400 Bug 20890: Increase control port connection timeout On slow computers, it can take longer than 30 seconds for Tor Launcher to connect to the tor control port. Increase the timeout to 5 minutes. --- src/components/tl-process.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/tl-process.js b/src/components/tl-process.js index 53c9919..2bf5a4c 100644 --- a/src/components/tl-process.js +++ b/src/components/tl-process.js @@ -38,8 +38,8 @@ TorProcessService.prototype = kWizardProgressPageID: "progress", kInitialControlConnDelayMS: 25, - kMaxControlConnRetryMS: 500, - kControlConnTimeoutMS: 30000, // Wait at most 30 seconds for tor to start. + kMaxControlConnRetryMS: 2000, // Retry at least every 2 seconds. + kControlConnTimeoutMS: 5*60*1000, // Wait at most 5 minutes for tor to start. kStatusUnknown: 0, // Tor process status. kStatusStarting: 1,

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 16 May '18

16 May '18

commit f14a6efac124fe4b87b3e840737ab4ed7f8adb5f Author: Translation commit bot <translation(a)torproject.org> Date: Wed May 16 20:16:52 2018 +0000 Update translations for tails-misc --- fa.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/fa.po b/fa.po index 3960aec84..ea175207c 100644 --- a/fa.po +++ b/fa.po @@ -24,14 +24,14 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2018-03-12 19:03+0100\n" -"PO-Revision-Date: 2018-04-12 19:07+0000\n" -"Last-Translator: 🤖Nariman نریمان\n" +"PO-Revision-Date: 2018-05-16 19:51+0000\n" +"Last-Translator: magnifico\n" "Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: fa\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=((n<=1 && n>= 0) ? 1);\n" #: config/chroot_local-includes/etc/NetworkManager/dispatcher.d/60-tor-ready.sh:39 msgid "Tor is ready" @@ -212,7 +212,7 @@ msgstr "تغییر آدرس MAC برای کارت شبکه ${nic_name} (${nic}) #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 msgid "Lock Screen" -msgstr "" +msgstr "قفل صفحه" #: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 #: config/chroot_local-includes/usr/local/bin/tor-browser:46

1 0

[stem/master] ConfChangedEvent could not represent multiple config values
by atagar＠torproject.org 16 May '18

16 May '18

commit f19b9273630b05c42b8fe4d59f449f001d870cba Author: Damian Johnson <atagar(a)torproject.org> Date: Wed May 16 13:01:28 2018 -0700 ConfChangedEvent could not represent multiple config values Great catch from dmr. The ConfChangedEvent's config was a simple {str => str} mapping, but some tor configuration options can have multiple values. For instance... 650-CONF_CHANGED 650-ExitPolicy=accept 34.3.4.5 650-ExitPolicy=accept 3.4.53.3 650 OK We can't change the event's config attribute without breaking backward compatability, but that's ok. Fiddling with this event a bit it's usage was actually kinda clunky since we bundled config unsetting with modifications. As such, splitting the 'config' attribute into a 'changed' and 'unset'. This time with changed as a {str => list} mapping. Here's a little demo of what the new usage might look like... def print_config_changes(event): for key, values in my_event.changed: print('We changed %s to %s' % (key, ', '.join(values)) for key in my_event.unset: print('We removed our configuration of %s' % key) my_controller.add_event_listener(print_config_changes, EventType.CONF_CHANGED) --- docs/change_log.rst | 1 + stem/response/events.py | 19 ++++++++++++++++--- test/unit/response/events.py | 33 ++++++++++++++++++++++++++++++--- 3 files changed, 47 insertions(+), 6 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 54a1e628..549e89c5 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -52,6 +52,7 @@ The following are only available within Stem's `git repository * Stacktrace if :func:`stem.connection.connect` had a string port argument * More reliable ExitPolicy resolution (:trac:`25739`) * Added the delivered_read, delivered_written, overhead_read, and overhead_written attributes to :class:`~stem.response.events.CircuitBandwidthEvent` (:spec:`fbb38ec`) + * Replaced the *config* attribute of :class:`~stem.response.events.ConfChangedEvent` with a *changed* and *unset* attributes * Replaced socket's :func:`~stem.socket.ControlPort.get_address`, :func:`~stem.socket.ControlPort.get_port`, and :func:`~stem.socket.ControlSocketFile.get_socket_path` with attributes * Removed 'raw' argument from :func:`~stem.socket.ControlSocket.send` diff --git a/stem/response/events.py b/stem/response/events.py index 1048e2ba..a50d90f8 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -570,15 +570,26 @@ class ConfChangedEvent(Event): The CONF_CHANGED event was introduced in tor version 0.2.3.3-alpha. - :var dict config: mapping of configuration options to their new values - (**None** if the option is being unset) + .. deprecated:: 1.7.0 + Deprecated the *config* attribute. Some tor configuration options (like + ExitPolicy) can have multiple values, so a simple 'str => str' mapping + meant that we only provided the last. + + .. versionchanged:: 1.7.0 + Added the changed and unset attributes. + + :var dict changed: mapping of configuration options to a list of their new + values + :var list unset: configuration options that have been unset """ _SKIP_PARSING = True _VERSION_ADDED = stem.version.Requirement.EVENT_CONF_CHANGED def _parse(self): - self.config = {} + self.changed = {} + self.unset = [] + self.config = {} # TODO: remove in stem 2.0 # Skip first and last line since they're the header and footer. For # instance... @@ -592,8 +603,10 @@ class ConfChangedEvent(Event): for line in str(self).splitlines()[1:-1]: if '=' in line: key, value = line.split('=', 1) + self.changed.setdefault(key, []).append(value) else: key, value = line, None + self.unset.append(key) self.config[key] = value diff --git a/test/unit/response/events.py b/test/unit/response/events.py index 69a3624b..82506e6d 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -252,6 +252,13 @@ CONF_CHANGED_EVENT = """650-CONF_CHANGED 650 OK """ +CONF_CHANGED_EVENT_MULTIPLE = """650-CONF_CHANGED +650-ExitPolicy=accept 34.3.4.5 +650-ExitPolicy=accept 3.4.53.3 +650-MaxCircuitDirtiness=20 +650 OK +""" + # GUARD events from tor v0.2.1.30. GUARD_NEW = '650 GUARD ENTRY $36B5DBA788246E8369DBAF58577C6BC044A9A374 NEW' @@ -863,15 +870,35 @@ class TestEvents(unittest.TestCase): def test_conf_changed(self): event = _get_event(CONF_CHANGED_EVENT) + self.assertTrue(isinstance(event, stem.response.events.ConfChangedEvent)) + + self.assertEqual({ + 'ExitNodes': ['caerSidi'], + 'MaxCircuitDirtiness': ['20'], + }, event.changed) - expected_config = { + self.assertEqual(['ExitPolicy'], event.unset) + + self.assertEqual({ 'ExitNodes': 'caerSidi', 'MaxCircuitDirtiness': '20', 'ExitPolicy': None, - } + }, event.config) + event = _get_event(CONF_CHANGED_EVENT_MULTIPLE) self.assertTrue(isinstance(event, stem.response.events.ConfChangedEvent)) - self.assertEqual(expected_config, event.config) + + self.assertEqual({ + 'ExitPolicy': ['accept 34.3.4.5', 'accept 3.4.53.3'], + 'MaxCircuitDirtiness': ['20'], + }, event.changed) + + self.assertEqual([], event.unset) + + self.assertEqual({ + 'ExitPolicy': 'accept 3.4.53.3', # overwrote with second value + 'MaxCircuitDirtiness': '20', + }, event.config) def test_descchanged_event(self): # all we can check for is that the event is properly parsed as a

1 0