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

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

23 Jan '20

commit c5ca4f8ed91823c7344e17324fcdf901886d786d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 06:23:21 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 48 insertions(+), 1 deletion(-) diff --git a/contents+fa.po b/contents+fa.po index a43f609dfa..f675643df7 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -3041,6 +3041,8 @@ msgid "" "The default configuration should work fine for most Tor users (hence the " "warning above.)" msgstr "" +"پیکربندی پیش فرض باید برای اکثر کاربران Tor بدون هیچ مشکل کار کند ( به همین " +"دلیل هشدار بالا آمده است.)" #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3062,6 +3064,8 @@ msgid "" "* The `torrc` is in the Tor Browser Data directory at " "`Browser/TorBrowser/Data/Tor` inside your Tor Browser directory." msgstr "" +"* `torrc` داخل دایرکتوری داده مرورگر Tor در `Browser/TorBrowser/Data/Tor` " +"داخل دایرکتوری مرورگر Tor شما قرار گرفته است." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3074,6 +3078,8 @@ msgid "" "* The `torrc` is in the Tor Browser Data directory at `~/Library/Application" " Support/TorBrowser-Data/Tor`." msgstr "" +"* `torrc` در دایرکتوری داده مرورگر Tor در `~/Library/Application Support" +"/TorBrowser-Data/Tor` قرار گرفته است." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3089,6 +3095,8 @@ msgstr "" #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) msgid "* Then type \"~/Library/Application Support/\" in the window and click Go." msgstr "" +"* سپس \"~/Library/Application Support/\" را در پنجره نوشته و روی Go کلیک " +"کنید." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3096,6 +3104,8 @@ msgid "" "Close Tor Browser before you edit your `torrc`, otherwise Tor Browser may " "erase your modifications." msgstr "" +"قبل از ویرایش `torrc` مرورگر Tor را ببندید، در غیر اینصورت مرورگر Tor ممکن " +"است اصلاحات شما را پاک کند." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3118,6 +3128,8 @@ msgid "" "For other configuration options you can use, see the [Tor manual " "page](https://2019.www.torproject.org/docs/tor-manual.html.en)." msgstr "" +"برای گزینه های پیکربندی دیگری که می توانید از آن استفاده کنید، [صفحه راهنما " +"Tor](https://2019.www.torproject.org/docs/tor-manual.html.en) را ببینید." #: https//support.torproject.org/tbb/tbb-editing-torrc/ #: (content/tbb/tbb-editing-torrc/contents+en.lrquestion.description) @@ -3125,6 +3137,8 @@ msgid "" "Remember, all lines beginning with `#` in torrc are treated as comments and " "have no effect on Tor's configuration." msgstr "" +"به یاد داشته باشید، تمام خطوط در torrc که با `#` شروع می شوند به عنوان کامنت" +" در نظر گرفته می شوند و هیچ تاثیری روی پیکربندی Tor ندارند." #: https//support.torproject.org/tormessenger/tormessenger-1/ #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.title) @@ -3137,6 +3151,8 @@ msgid "" "No. After eleven beta releases, we discontinued support of [Tor " "Messenger](https://blog.torproject.org/sunsetting-tor-messenger)." msgstr "" +"خیر. پس از یازده انتشار بتا، ما پشتیبانی [پیام رسان " +"Tor](https://blog.torproject.org/sunsetting-tor-messenger) را متوقف کردیم." #: https//support.torproject.org/tormessenger/tormessenger-1/ #: (content/tormessenger/tormessenger-1/contents+en.lrquestion.description) @@ -3166,6 +3182,9 @@ msgid "" "specifically for Android. Installing Tor Browser for Android is all you need" " to run Tor on your Android device." msgstr "" +"بله، یک نسخه از [مرورگر Tor](https://www.torproject.org/download/#android) " +"برای اندروید وجود دارد. نصب مرورگر Tor برای اندروید تنها چیزی است که برای " +"اجرا Tor روی دستگاه های اندروید خود نیاز دارید." #: https//support.torproject.org/tormobile/tormobile-1/ #: (content/tormobile/tormobile-1/contents+en.lrquestion.description) @@ -3204,6 +3223,9 @@ msgid "" " routing, and is developed by someone who works closely with the Tor " "Project." msgstr "" +"ما یک برنامه iOS را به نام مرورگر Onion توصیه می کنیم که متن باز بوده و از " +"مسیریابی Tor استفاده می کند و توسط شخصی توسعه داده شده است که با پروژه Tor " +"همکاری نزدیکی دارد." #: https//support.torproject.org/tormobile/tormobile-3/ #: (content/tormobile/tormobile-3/contents+en.lrquestion.description) @@ -3258,6 +3280,9 @@ msgid "" "Android](https://www.torproject.org/download/#android) Orfox has been " "[retired](https://blog.torproject.org/orfox-paved-way-tor-browser-android)." msgstr "" +"با انتشار [مرورگر Tor برای " +"اندروید](https://www.torproject.org/download/#android) Orfox [کنار گذاشته " +"شده است](https://blog.torproject.org/orfox-paved-way-tor-browser-android)." #: https//support.torproject.org/tormobile/tormobile-6/ #: (content/tormobile/tormobile-6/contents+en.lrquestion.title) @@ -3294,6 +3319,10 @@ msgid "" "through the tor network; a version of Orbot is also inside of the Tor " "Browser for Android, and is what enables it to connect to the Tor network." msgstr "" +"Orbot در عوض یک پراکسی می باشد که به شما اجازه می دهد تا داده برنامه های " +"دیگر خود (کلاینت ایمیل، پیام رسان های فوری، غیره) را از شبکه tor رد کنید. یک" +" نسخه از Orbot هم چنین در مرورگر Tor برای اندروید وجود دارد و چیزی است که به" +" آن اجازه می دهد تا به شبکه Tor وصل شود." #: https//support.torproject.org/tormobile/tormobile-6/ #: (content/tormobile/tormobile-6/contents+en.lrquestion.description) @@ -3301,6 +3330,8 @@ msgid "" "That version, however, does not enable you to send other apps outside of the" " Tor Browser for Android through it." msgstr "" +"آن نسخه، هرچند به شما اجازه نمی دهد تا برنامه های دیگر که خارج از مرورگر Tor" +" می باشند و برای اندروید می باشند را از آن ارسال کنید. " #: https//support.torproject.org/tormobile/tormobile-6/ #: (content/tormobile/tormobile-6/contents+en.lrquestion.description) @@ -3308,6 +3339,8 @@ msgid "" "Depending on how you want to use the tor network, either one or both of " "these could be a great option." msgstr "" +"بسته به اینکه به چه شکل می خواهید از شبکه tor استفاده کنید، یکی از اینها می " +"تواند گزینه خوبی باشد." #: https//support.torproject.org/tormobile/tormobile-7/ #: (content/tormobile/tormobile-7/contents+en.lrquestion.title) @@ -3326,6 +3359,8 @@ msgid "" "enabling the [Guardian Project's " "Repository](https://guardianproject.info/fdroid/)." msgstr "" +"در این زمان می توانید از F-Droid برای دانلود مرورگر Tor اندروید با فعال سازی" +" [مخزن پروژه گاردین](https://guardianproject.info/fdroid/) استفاده کنید. " #: https//support.torproject.org/tormobile/tormobile-7/ #: (content/tormobile/tormobile-7/contents+en.lrquestion.description) @@ -3333,6 +3368,8 @@ msgid "" "[Learn how to add a repository to F-Droid](https://f-droid.org/en/tutorials" "/add-repo/)." msgstr "" +"[یاد بگیرید چه طور می توانید یک مخزن به F-Droid اضافه " +"کنید.](https://f-droid.org/en/tutorials/add-repo/)" #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.title) @@ -3350,6 +3387,9 @@ msgid "" "[website](https://www.torproject.org), you can get a copy of Tor Browser " "delivered to you via [GetTor](https://gettor.torproject.org/)." msgstr "" +"اگر نمی توانید مرورگر Tor را از [سایت](https://www.torproject.org) دانلود " +"کنید، می توانید یک نسخه از مرورگر Tor را از " +"[GetTor](https://gettor.torproject.org/) دریافت کنید." #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) @@ -3360,6 +3400,10 @@ msgid "" "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." msgstr "" +"GetTor یک سرویس می باشد که به صورت خودکار به پیام هایی با لینک هایی از آخرین" +" نسخه از مرورگر Tor پاسخ می دهد که در مکان های مختلف میزبانی شده است و به " +"همین دلیل احتمال سانسور شدن آن کمتر می باشد، مانند Dropbox، Google Drive و " +"گیت هاب." #: https//support.torproject.org/gettor/gettor-1/ #: (content/gettor/gettor-1/contents+en.lrquestion.description) @@ -3452,7 +3496,7 @@ msgstr "* لینوکس" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) msgid "* macOS (OS X)" -msgstr "" +msgstr "* مک" #: https//support.torproject.org/gettor/gettor-4/ #: (content/gettor/gettor-4/contents+en.lrquestion.description) @@ -3875,6 +3919,9 @@ msgid "" "I urge you to reconsider this decision; Tor is used by people all over the " "world to protect their privacy and fight censorship." msgstr "" +"ما از شما می خواهیم تا در تصمیم خود تجدید نظر کنید، Tor توسط افراد زیادی در " +"سر تا سر جهان برای اینکه از خریم خصوصی خود محافظت کنند و با سانسور مبارزه " +"کنند استفاده می شود." #: https//support.torproject.org/censorship/censorship-2/ #: (content/censorship/censorship-2/contents+en.lrquestion.description)

1 0

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

23 Jan '20

commit 1846f358dbffe5060351ccd11151669923aa4489 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 05:53:25 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fa.po | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/contents+fa.po b/contents+fa.po index 285dc367d2..a43f609dfa 100644 --- a/contents+fa.po +++ b/contents+fa.po @@ -715,6 +715,8 @@ msgid "" "See our [trademark FAQ](https://www.torproject.org/about/trademark/) for " "details." msgstr "" +"برای جزییات سوالات متداول [علامت تجاری " +"ما](https://www.torproject.org/about/trademark/) را ببینید." #: https//support.torproject.org/about/how-is-tor-different-from-other-proxies/ #: (content/about/how-is-tor-different-from-other-proxies/contents+en.lrquestion.title) @@ -946,6 +948,8 @@ msgid "" "Tor Browser tries to keep application-level data, like the user-agent " "string, uniform for all users." msgstr "" +"مرورگر Tor سعی می کند تا داده سطح برنامه را، مانند رشته user-agent، برای " +"تمام کاربران یکسان نگه دارد." #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -2788,6 +2792,8 @@ msgid "" "Even though this may be a byproduct of using the service via Tor, that " "doesn't mean you can entirely ignore the warning." msgstr "" +"هرچند ممکن است این نتیجه استفاده از سرویس با Tor باشد، این به این معنا نیست " +"که شما می توانید از این هشدار چشم پوشی کنید." #: https//support.torproject.org/tbb/tbb-45/ #: (content/tbb/tbb-45/contents+en.lrquestion.description)

1 0

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

23 Jan '20

commit a6d890879e52a40543ff4d5a8f43a2fdb4e51cca Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 05:45:28 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+tr.po | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/contents+tr.po b/contents+tr.po index 11e2cb6bb6..0a328a7dbc 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -1013,6 +1013,8 @@ msgid "" "Generally, most complaints can be handled pretty easily through template " "letters, which we'll discuss more in legal considerations section." msgstr "" +"Genel olarak çoğu şikayet, hazır metinler kullanılarak kolayca çözülebilir." +" Bunları ileride yasal konular bölümünde ele alacağız." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1020,6 +1022,8 @@ msgid "" "Because of the legal exposure that comes with running an exit relay, you " "should not run a Tor exit relay from your home." msgstr "" +"Bir çıkış aktarıcısı işletmenin getireceği yasal takibe olasılığı nedeniyle " +"evinizde bir Tor çıkış aktarıcısı işletmemelisiniz." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1027,6 +1031,9 @@ msgid "" "Ideal exit relay operators are affiliated with some institution, like a " "university, a library, a hackerspace or a privacy related organization." msgstr "" +"İdeal çıkış aktarıcısı işletmecileri, universiteler, kütüphaneler, kişisel " +"gizliliği koruma kuruluşları, bilgisayar korsanı toplulukları gibi bazı " +"kurumlar ile iş birliği yapanlardır." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1035,6 +1042,9 @@ msgid "" "better positioned to handle abuse complaints or the rare law enforcement " "inquiry." msgstr "" +"Bir kurum yalnız çıkış aktarıcısı için daha iyi bir bant genişliği " +"sağlamakla kalmaz, nadiren karşılaşılan kötüye kullanım ile ilgili yasal " +"kolluk soruşturmalarını da daha rahat karşılar." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1042,6 +1052,9 @@ msgid "" "If you are considering running an exit relay, please read the [section on " "legal considerations](/relay/community-resources) for exit relay operators." msgstr "" +"Bir çıkış aktarıcısı kullanmayı düşünüyorsanız, çıkış aktarıcısı " +"işletmecileri için [yasal konular](/relay/community-resources) bölümüne " +"bakın." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -1145,6 +1158,8 @@ msgid "" "Exit relay operators should understand the potential risks associated with " "running an exit relay." msgstr "" +"Çıkış aktarıcısı işletmecileri, bir çıkış aktarıcısından sorumlu olmanın " +"olası risklerini iyi anlamalıdır." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1152,8 +1167,8 @@ msgid "" "For the majority of operators in most countries, bridges and guard/middle " "relays are very low risk." msgstr "" -"Pek çok ülkedeki işletmecilerin çoğu için köprü ve koruma/orta aktarıcıları " -"çok düşük risk oluşturur." +"Pek çok ülkede, işletmecilerin çoğu için köprü ve koruma/orta aktarıcıları " +"işletmenin riski çok düşüktür." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) @@ -1197,12 +1212,12 @@ msgstr "" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "Also see the [Tor Exit Guidelines](tor-exit-guidelines)." -msgstr "" +msgstr "Ayrıca [Tor Çıkış Rehberi](tor-exit-guidelines) bölümüne bakın." #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body) msgid "# Responding to abuse complaints" -msgstr "" +msgstr "# Kötüye kullanım şikayetlerini yanıtlamak" #: https//community.torproject.org/relay/community-resources/ #: (content/relay-operations/community-resources/contents+en.lrpage.body)

1 0

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

23 Jan '20

commit 6637d0d1548d6197c56d4edd3412f4dfdbbb723f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 23 05:15:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten… --- contents+tr.po | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/contents+tr.po b/contents+tr.po index 5668b90337..11e2cb6bb6 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -961,6 +961,8 @@ msgid "" "The exit relay is the final relay in a Tor circuit, the one that sends " "traffic out its destination." msgstr "" +"Çıkış aktarıcısı bir Tor devresinde trafiği hedefine gönderen son " +"aktarıcıdır. " #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -969,6 +971,9 @@ msgid "" "provider, etc) will see the IP address of the exit relay instead of their " "real IP address of the Tor user." msgstr "" +"Tor istemcilerinin bağlandığı hizmetler (web sitesi, sohbet, e-posta " +"hizmetleri gibi) Tor kullanıcısının gerçek IP adresi yerine çıkış " +"aktarıcısının IP adresini görür." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -976,6 +981,8 @@ msgid "" "Exit relays have the greatest legal exposure and liability of all the " "relays." msgstr "" +"Tüm aktarıcılar içinde en fazla çıkış aktarıcıları yasal takip ve yükümlülük" +" konuları ile karşılaşır." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -985,6 +992,10 @@ msgid "" "notice](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-" "ba92-3d58c8345a32&?ref=sol08a2)." msgstr "" +"Örneğin bir kullanıcı sizin çıkış aktarıcınızı kullanarak telif hakları ile " +"korunan bir ürün indiriyorsa, işletmeciniza bir [DMCA " +"bildirimi](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-" +"ba92-3d58c8345a32&?ref=sol08a2) gönderilir." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body) @@ -992,6 +1003,9 @@ msgid "" "Any abuse complaints about the exit will go directly to you (via your " "hoster, depending on the WHOIS records)." msgstr "" +"Çıkış aktarıcısı hakkındaki tüm kötüye kullanım şikayetleri doğrudan size " +"gelir (WHOIS kayıtlarına bağlı olarak, barındırma hizmeti sağlayıcınız " +"yoluyla)." #: https//community.torproject.org/relay/types-of-relays/ #: (content/relay-operations/types-of-relays/contents+en.lrpage.body)

1 0

[gettor/master] Extend script to update gitlab remote
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit c63cb34499ffb348711104e1c5adbc1c7f168eef Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 10 17:12:31 2020 -0500 Extend script to update gitlab remote Updated and refactored the script to upload tor browser binaries to the gitlab remote using the GitLab REST API. --- scripts/update_github | 140 ++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 107 insertions(+), 33 deletions(-) diff --git a/scripts/update_github b/scripts/update_github index 34eb6c0..f896cd0 100755 --- a/scripts/update_github +++ b/scripts/update_github @@ -1,17 +1,22 @@ #!/usr/bin/env python3 -#pip3 install PyGithub +# Dependencies: +# pip3 install PyGithub +# pip3 install python-gitlab -# Before running, place the authentication token for a user with push access to the repository -# in an environment variable 'GITHUB_AUTH' +# Before running, place the authentication token for a user with push access to +# the Github repository in an environment variable 'GITHUB_AUTH' and a token to +# access the GitLab repository in an environment variable 'GITLAB_AUTH' from github import Github +from gitlab import Gitlab import sys import json import urllib import subprocess import os +import base64 REPO_NAME = "torproject/torbrowser-releases" @@ -19,14 +24,73 @@ failure = False failed_uploads = [] -def delete_old_releases(repo): - for release in repo.get_releases(): - for asset in release.get_assets(): - asset.delete_asset() - release.delete_release() +class GitlabRemote: + def __init__(self, token): + self.gl = Gitlab("https://gitlab.com", private_token=token) + + def delete_old_projects(self): + projects = self.gl.projects.list(owned=True) + for project in projects: + project.delete() + + def create_projects(self): + # Create one project for each platform + self.windows = self.gl.projects.create({'name': 'torbrowser-windows'}) + self.mac = self.gl.projects.create({'name': 'torbrowser-osx'}) + self.linux = self.gl.projects.create({'name': 'torbrowser-linux'}) + + def upload(self, filename, arch): + with open(filename, 'rb') as f: + contents = f.read() + data = { + 'branch': 'master', + 'commit_message': 'GetTor automated commit - update with new Tor Browser downloads', + 'actions': [ + { + # Binary files need to be base64 encoded + 'action': 'create', + 'file_path': filename, + 'content': base64.b64encode(contents), + 'encoding': 'base64', + } + ] + } + + if arch == 'linux32' or arch == 'linux64': + commit = self.linux.commits.create(data) + elif arch == 'win32' or arch == 'win64': + commit = self.windows.commits.create(data) + elif arch == 'osx64': + commit = self.mac.commits.create(data) + else: + # Something changed with the structure of the downloads json file + print("Unkown architecture: " + arch) + sys.exit(1) + + +class GithubRemote: + def __init__(self, token): + g = Github(token) + self.repo = g.get_repo(REPO_NAME) + + def delete_old_releases(self): + for release in self.repo.get_releases(): + for asset in release.get_assets(): + asset.delete_asset() + release.delete_release() + + def create_release(self): + self.release = self.repo.create_git_release("torbrowser-release", "Tor Browser releases", "These releases were uploaded to be distributed with gettor.") + + def upload(self, filename, arch): + self.release.upload_asset(filename) #Download list of tor browser releases and upload them to github -def upload_files(release): +def upload_files(remotes): + if len(remotes) == 0: + print("ERROR: No remotes to update", file=sys.stderr) + return 1 + url = urllib.request.urlopen("https://aus1.torproject.org/torbrowser/update_3/release/downloads.json") data = json.loads(url.read().decode()) for arch in data['downloads']: @@ -36,44 +100,54 @@ def upload_files(release): filename = url.split('/')[-1] try: subprocess.check_call(["/usr/bin/wget", "--quiet", url]) - release.upload_asset(filename) - os.remove(filename) + except: - print("Error: failed to update "+url+". Will retry later.") + print("Error: failed to fetch "+url+". Will retry later.") failed_uploads.append(url) + continue + + for remote in remotes: + remote.upload(filename, arch) + os.remove(filename) #Retry failed uploads for url in failed_uploads: filename = url.split('/')[-1] try: subprocess.check_call(["/usr/bin/wget", "--quiet", url]) - release.upload_asset(filename) + for remote in remotes: + remote.upload(filename, arch) os.remove(filename) except: print("Error: failed to update "+url+". Please upload this file manually.") failure = True - -def main(token): - - #Initialize a new release - g = Github(token) - repo = g.get_repo(REPO_NAME) - - delete_old_releases(repo) - - #Create a new release - release = repo.create_git_release("torbrowser-release", "Tor Browser releases", "These releases were uploaded to be distributed with gettor.") - upload_files(release) - if failure: - sys.exit(1) + return 1 -if __name__ == "__main__": +def main(): + remotes = [] if 'GITHUB_AUTH' not in os.environ: - print("Usage: {}".format(sys.argv[0]), file=sys.stderr) - print("\nThe authentication token for github should be placed in the environment" + print("WARNING: No Github authentication token given", file=sys.stderr) + print("The authentication token for github should be placed in the environment" "variable 'GITHUB_AUTH'", file=sys.stderr) - sys.exit(1) - token = os.environ['GITHUB_AUTH'] - sys.exit(main(token)) + else: + github = GithubRemote(os.environ['GITHUB_AUTH']) + github.delete_old_releases() + github.create_release() + remotes.append(github) + + if 'GITLAB_AUTH' not in os.environ: + print("WARNING: No GitLab authenticatin token given", file=sys.stderr) + print("The authentication token for gitlab should be placed in the environment" + "variable 'GITLAB_AUTH'", file=sys.stderr) + else: + gitlab = GitlabRemote(os.environ['GITLAB_AUTH']) + gitlab.delete_old_projects() + gitlab.create_projects() + remotes.append(gitlab) + + return upload_files(remotes) + +if __name__ == "__main__": + sys.exit(main())

1 0

[gettor/master] Modified scripts to add correct gitlab links to db
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 8260a79d95fc20f0e2266b681e0052f3515c233f Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 10 17:55:16 2020 -0500 Modified scripts to add correct gitlab links to db --- scripts/add_links_to_db | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index 114c729..eaf66d6 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -71,7 +71,7 @@ def main(): sys.exit(1) providers = { - "gitlab": "https://gitlab.com/thetorproject/gettorbrowser/raw/torbrowser-releases/", + "gitlab": "https://gitlab.com/thetorproject/torbrowser-arch/raw/master/", "github": "https://github.com/torproject/torbrowser-releases/releases/download/torbrow…" } @@ -145,7 +145,8 @@ def main(): release_link = releases.get(k).replace("en-US", l) c.execute( "INSERT INTO links(link, platform, language, arch, version, provider, status, file)" - "VALUES ('%s', '%s', '%s', '64', '%s', '%s', 'ACTIVE', '%s')" % (providers.get(p) + release_link, k, l, version, p, release_link)) + "VALUES ('%s', '%s', '%s', '64', '%s', '%s', 'ACTIVE', '%s')" + % (providers.get(p).replace("arch", k) + release_link, k, l, version, p, release_link)) if __name__ == "__main__":

1 0

[gettor/master] Renamed update_github to a more generic update_git
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit 78415a6d328923a79a32c0366a1bee353ba60324 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Jan 10 17:12:50 2020 -0500 Renamed update_github to a more generic update_git --- scripts/{update_github => update_git} | 0 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/scripts/update_github b/scripts/update_git similarity index 100% rename from scripts/update_github rename to scripts/update_git

1 0

[gettor/master] Removed git commands from update_files script
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit cbec273581903587ccac78ae9095feebe2c54401 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jan 15 10:19:29 2020 -0500 Removed git commands from update_files script We now have a separate script for both GitLab and Github endpoints. --- scripts/update_files | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/scripts/update_files b/scripts/update_files index ce12a3e..c5ccc9e 100755 --- a/scripts/update_files +++ b/scripts/update_files @@ -3,26 +3,17 @@ # This file is part of GetTor, a Tor Browser distribution system. # # :authors: hiro <hiro(a)torproject.org> +# cecylia <cohosh(a)torproject.org> # see also AUTHORS file # # :copyright: (c) 2008-2019, The Tor Project, Inc. # # :license: This is Free Software. See LICENSE for license information. # -# Updates all the files in all the endpoints. +# Updates tor browser binaries at Google Drive and Internet Archive # cd ~/releases -git checkout master -git branch -D torbrowser-releases - -git fetch --all --prune - -git add . -git commit -am 'Create release branch' -git checkout -b torbrowser-releases -git push -f --follow-tags origin torbrowser-releases - rclone delete gdrive:releases rclone cleanup gdrive:releases @@ -36,17 +27,7 @@ for row in $( tr -d '",' ); if [[ $r = *[!\ ]* ]]; then - # Update GitLab - git fetch --all wget $r - git add . - git commit -m '[dist ci] commit from CI runner - update with new torbrowser downloads' - diffs=$(git diff origin/torbrowser-releases) - if [ -z "$diffs" ]; then - echo "No new releases" - else - git push -f --follow-tags origin torbrowser-releases - fi f=${r##*/}

1 0

[gettor/master] Clean up script based on feedback
by cohosh＠torproject.org 23 Jan '20

23 Jan '20

commit ff6379b556bad75e86c0130777d27bb014870281 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jan 22 14:50:17 2020 -0500 Clean up script based on feedback This commit cleans up the script a bit by: - making more detailed comments, - streamlining the choice of remote repository - printing all output to std error - captilization consistency --- scripts/add_links_to_db | 2 ++ scripts/update_git | 37 +++++++++++++++++++------------------ 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/scripts/add_links_to_db b/scripts/add_links_to_db index eaf66d6..039bc4f 100755 --- a/scripts/add_links_to_db +++ b/scripts/add_links_to_db @@ -70,6 +70,8 @@ def main(): print("Could not fetch version from {}.".format(TOR_BROWSER_DOWNLOADS)) sys.exit(1) + # For gitlab, we have three repositories for linux, mac, and windows. + # The string "arch" will later be replaced with the respective architecture providers = { "gitlab": "https://gitlab.com/thetorproject/torbrowser-arch/raw/master/", "github": "https://github.com/torproject/torbrowser-releases/releases/download/torbrow…" diff --git a/scripts/update_git b/scripts/update_git index f896cd0..c398ff4 100755 --- a/scripts/update_git +++ b/scripts/update_git @@ -35,9 +35,18 @@ class GitlabRemote: def create_projects(self): # Create one project for each platform - self.windows = self.gl.projects.create({'name': 'torbrowser-windows'}) - self.mac = self.gl.projects.create({'name': 'torbrowser-osx'}) - self.linux = self.gl.projects.create({'name': 'torbrowser-linux'}) + windows_repo = self.gl.projects.create({'name': 'torbrowser-windows'}) + mac_repo = self.gl.projects.create({'name': 'torbrowser-osx'}) + linux_repo = self.gl.projects.create({'name': 'torbrowser-linux'}) + + self.repositories = { + "linux32" : linux_repo, + "linux64" : linux_repo, + "win32" : windows_repo, + "win64" : windows_repo, + "osx64" : mac_repo + } + def upload(self, filename, arch): with open(filename, 'rb') as f: @@ -56,17 +65,7 @@ class GitlabRemote: ] } - if arch == 'linux32' or arch == 'linux64': - commit = self.linux.commits.create(data) - elif arch == 'win32' or arch == 'win64': - commit = self.windows.commits.create(data) - elif arch == 'osx64': - commit = self.mac.commits.create(data) - else: - # Something changed with the structure of the downloads json file - print("Unkown architecture: " + arch) - sys.exit(1) - + self.repositories[arch].commits.create(data) class GithubRemote: def __init__(self, token): @@ -85,10 +84,10 @@ class GithubRemote: def upload(self, filename, arch): self.release.upload_asset(filename) -#Download list of tor browser releases and upload them to github +#Download list of tor browser releases and upload them to remote repositories def upload_files(remotes): if len(remotes) == 0: - print("ERROR: No remotes to update", file=sys.stderr) + print("Error: No remotes to update", file=sys.stderr) return 1 url = urllib.request.urlopen("https://aus1.torproject.org/torbrowser/update_3/release/downloads.json") @@ -102,7 +101,8 @@ def upload_files(remotes): subprocess.check_call(["/usr/bin/wget", "--quiet", url]) except: - print("Error: failed to fetch "+url+". Will retry later.") + print("Error: failed to fetch "+url+". Will retry later.", + file=sys.stderr) failed_uploads.append(url) continue @@ -118,7 +118,8 @@ def upload_files(remotes): remote.upload(filename, arch) os.remove(filename) except: - print("Error: failed to update "+url+". Please upload this file manually.") + print("Error: failed to update "+url+". Please upload this file manually.", + file=sys.stderr) failure = True if failure:

1 0

[tor/master] Bump to 0.4.3.1-alpha-dev
by nickm＠torproject.org 23 Jan '20

23 Jan '20

commit e34d963c4453ceac7ff378ce0044d10461980c8e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 22 20:30:46 2020 -0500 Bump to 0.4.3.1-alpha-dev --- configure.ac | 4 ++-- contrib/win32build/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index b4a0a4e7f..63e13d00b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2019, The Tor Project, Inc. dnl See LICENSE for licensing information AC_PREREQ([2.63]) -AC_INIT([tor],[0.4.3.1-alpha]) +AC_INIT([tor],[0.4.3.1-alpha-dev]) AC_CONFIG_SRCDIR([src/app/main/tor_main.c]) AC_CONFIG_MACRO_DIR([m4]) @@ -16,7 +16,7 @@ configure_flags="$*" # version number changes. Tor uses it to make sure that it # only shuts down for missing "required protocols" when those protocols # are listed as required by a consensus after this date. -AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-21"], # for 0.4.3.1-alpha +AC_DEFINE(APPROX_RELEASE_DATE, ["2020-01-23"], # for 0.4.3.1-alpha-dev [Approximate date when this software was released. (Updated when the version changes.)]) # "foreign" means we don't follow GNU package layout standards diff --git a/contrib/win32build/tor-mingw.nsi.in b/contrib/win32build/tor-mingw.nsi.in index 120fcdf47..3a4bd2c4b 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.4.3.1-alpha" +!define VERSION "0.4.3.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 2ed09b4cf..adcd9df3e 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -217,7 +217,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.4.3.1-alpha" +#define VERSION "0.4.3.1-alpha-dev" #define HAVE_STRUCT_SOCKADDR_IN6 #define HAVE_STRUCT_IN6_ADDR

1 0