tor-commits June 2020

tor-commits@lists.torproject.org

17 participants
1326 discussions

[translation/torbutton-torbuttonproperties] https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbuttonproperties
by translation＠torproject.org 06 Jun '20

06 Jun '20

commit 2bd76ca4a85f307984e367541ec3df1369d88b7c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 6 18:51:32 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton… --- ja/torbutton.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ja/torbutton.properties b/ja/torbutton.properties index 2cd03001f0..9263da425a 100644 --- a/ja/torbutton.properties +++ b/ja/torbutton.properties @@ -60,7 +60,7 @@ updateDownloadingPanelUILabel=%S 更新をダウンロードしています # .Onion Page Info prompt. Strings are kept here for ease of translation. pageInfo_OnionEncryptionWithBitsAndProtocol=接続が暗号化されています (Onion サービス、%1$S、鍵長 %2$S bit、%3$S) pageInfo_OnionEncryption=接続が暗号化されています (Onion サービス) -pageInfo_OnionName=Onion Name: +pageInfo_OnionName=Onion 名: # Onion services strings. Strings are kept here for ease of translation. onionServices.learnMore=詳細情報

1 0

[translation/bridgedb] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
by translation＠torproject.org 06 Jun '20

06 Jun '20

commit d7e3409b469a4a0b3d1d8f296258e789deaecc77 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 6 18:45:15 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=bridgedb --- ja/LC_MESSAGES/bridgedb.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po index 6bac884bdb..acafda2f50 100644 --- a/ja/LC_MESSAGES/bridgedb.po +++ b/ja/LC_MESSAGES/bridgedb.po @@ -18,8 +18,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2020-05-14 14:21-0700\n" -"PO-Revision-Date: 2020-05-15 08:24+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2020-06-06 18:43+0000\n" +"Last-Translator: 323484\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" @@ -100,7 +100,7 @@ msgstr "このブリッジのQRコードを携帯端末などのデバイスで #: bridgedb/distributors/https/templates/bridges.html:110 msgid "BridgeDB encountered an error." -msgstr "" +msgstr "BridgeDB でエラーが発生しました。" #: bridgedb/distributors/https/templates/bridges.html:116 msgid "There currently aren't any bridges available..." @@ -185,7 +185,7 @@ msgstr "%sブ%sリッジを入手する" #: bridgedb/strings.py:33 msgid "[This is an automated email.]" -msgstr "" +msgstr "[これは自動送信された電子メールです。]" #: bridgedb/strings.py:35 msgid "Here are your bridges:" @@ -401,7 +401,7 @@ msgstr "" #: bridgedb/strings.py:174 msgid "(Request IPv6 bridges.)" -msgstr "" +msgstr "( IPv6 ブリッジをリクエスト )" #: bridgedb/strings.py:175 msgid "(Request obfs4 obfuscated bridges.)"

1 0

[translation/tbmanual-contentspot] https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot
by translation＠torproject.org 06 Jun '20

06 Jun '20

commit 704c4f2ab43977046216537724704135f797edcd Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 6 14:50:27 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tbmanual-contentspot --- contents+ka.po | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/contents+ka.po b/contents+ka.po index 9c336e2953..25711c007e 100644 --- a/contents+ka.po +++ b/contents+ka.po @@ -647,11 +647,13 @@ msgid "" "The first checkbox asks if access to the Tor network is blocked or censored " "on your connection." msgstr "" +"პირველი მოსანიშნი გეკითხებათ, გაქვთ თუ არა Tor-ქსელთან წვდომა და შეზღუდული " +"ხომ არაა." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) msgid "If you do not believe this is the case, leave this unchecked." -msgstr "" +msgstr "თუ მიგაჩნიათ რომ არა, დატოვეთ მოუნიშნავი." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -660,6 +662,8 @@ msgid "" "connect to the Tor network and no other solutions have worked, check the " "checkbox." msgstr "" +"თუ იცით რომ ცენზურის ქვეშ ხართ ან სცადეთ დაკავშირება Tor-ქსელთან და ვერ " +"მოხერხდა, ამასთან ვერც სხვა გადაწყვეტებმა უშველა, მაშინ მონიშნეთ ეს უჯრა." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -667,6 +671,8 @@ msgid "" "This will display the [Circumvention](../circumvention) section to configure" " a pluggable transport." msgstr "" +"შედეგად გამოჩნდება [გვერდის ავლის](../circumvention) არე, საიდანაც შეძლებთ " +"გამართოთ მისაერთებელი გადამყვანები." #: https//tb-manual.torproject.org/running-tor-browser/ #: (content/running-tor-browser/contents+en.lrtopic.body) @@ -899,7 +905,7 @@ msgstr "" #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) msgid "Your settings will automatically be saved once you close the tab." -msgstr "" +msgstr "თქვენი პარამეტრები ავტომატურად შეინახება ჩანართის დახურვისას." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -922,6 +928,8 @@ msgid "" "If you are trying to circumvent a blocked connection for the first time, you" " should try the different transports: obfs4, snowflake, or meek-azure." msgstr "" +"თუ პირველად ცდილობთ შეზღუდული ქსელისთვის გვერდის ავლას, ჯობია მოსინჯოთ " +"სხვადასხვა სახის გადამყვანები: obfs4, snowflake ან meek-azure." #: https//tb-manual.torproject.org/circumvention/ #: (content/circumvention/contents+en.lrtopic.body) @@ -1062,6 +1070,9 @@ msgid "" "\"Request a bridge from torproject.org\" and click \"Request a Bridge...\" " "for BridgeDB to provide a bridge." msgstr "" +"როცა მონიშნავთ „Tor შეზღუდულია ჩემს ქვეყანაში“, აირჩიეთ „გადამცემი ხიდის " +"მოთხოვნა საიტიდან torproject.org“, შემდეგ კი დაწკაპეთ „გადამცემი ხიდის " +"მოთხოვნა...“ და BridgeDB მოგაწვდით მას." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1069,6 +1080,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Click \"Connect\" to save your " "settings." msgstr "" +"გაიარეთ CAPTCHA და დაწკაპეთ „გაგზავნა“. დააჭირეთ „დაკავშირებას“ პარამეტრების" +" დასამახსოვრებლად." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1077,6 +1090,9 @@ msgid "" "the option \"Request a bridge from torproject.org,\" click \"Request a New " "Bridge...\" for BridgeDB to provide a bridge." msgstr "" +"„ხიდების“ განყოფილებაში, მონიშნეთ „ხიდის გამოყენება“ და შემდეგ „გადამცემი " +"ხიდის მოთხოვნა საიტიდან torproject.org“, დაწკაპეთ „ახალი გადამცემი ხიდის " +"მოთხოვნა...\" და BridgeDB მოგაწვდით მას." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body) @@ -1084,6 +1100,8 @@ msgid "" "Complete the CAPTCHA and click \"Submit.\" Your setting will automatically " "be saved once you close the tab." msgstr "" +"გაიარეთ CAPTCHA და დაწკაპეთ „გაგზავნა“. თქვენი პარამეტრები ავტომატურად " +"შეინახება ჩანართის დახურვისას." #: https//tb-manual.torproject.org/bridges/ #: (content/bridges/contents+en.lrtopic.body)

1 0

[tor-browser-build/master] Changelog fixup
by gk＠torproject.org 06 Jun '20

06 Jun '20

commit 2c84d8d13c7313f88db9418aab0d4ff65c6610d6 Author: Georg Koppen <gk(a)torproject.org> Date: Sat Jun 6 08:01:02 2020 +0000 Changelog fixup --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 534c207..aa55f4f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -95,7 +95,7 @@ Tor Browser 9.5 -- June 2 2020 * Bug 33931: obfs4 bridges are used instead of meek if meek is selected in Tor Browser for Android alpha * Build System * All Platforms - * Go to 1.13.11 + * Bump Go to 1.13.11 * Bug 33380: Add *.json to sha256sums-unsigned-build.txt * Windows * Bug 33802: --enable-secure-api is not supported anymore in mingw-w64

1 0

[onionperf/master] Remove if condition that checks for args.model.
by karsten＠torproject.org 06 Jun '20

06 Jun '20

commit e580cb885d9bb18298f65c04e541d2152a8e7a0e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sat Jun 6 08:13:58 2020 +0200 Remove if condition that checks for args.model. Spotted by phw, part of #29370. --- onionperf/onionperf | 7 ------- 1 file changed, 7 deletions(-) diff --git a/onionperf/onionperf b/onionperf/onionperf index 6078d46..74285d1 100755 --- a/onionperf/onionperf +++ b/onionperf/onionperf @@ -328,13 +328,6 @@ def measure(args): # validate paths and run if args.torpath is not None and args.tgenpath is not None: os.chdir(args.prefix) - if args.model: - # load custom model instead of Torperf model - pass - else: - # build a Torperf model - # model.TorperfModel(tgen_port="{0}".format(tgen_port), tgen_servers=server_urls, socksproxy="127.0.0.1:{0}".format(socks_port)) - pass client_connect_ip = args.tgenconnectip client_connect_port = args.tgenconnectport

1 0

[translation/tor-launcher-network-settings] https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-network-settings
by translation＠torproject.org 05 Jun '20

05 Jun '20

commit 1b2d53ad83e7ae7c4d8cbd45a526111057245e05 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jun 5 22:52:49 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-networ… --- ia/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ia/network-settings.dtd b/ia/network-settings.dtd index b374aa996a..812e48b8b8 100644 --- a/ia/network-settings.dtd +++ b/ia/network-settings.dtd @@ -66,7 +66,7 @@ <!ENTITY torPreferences.torSettings "Tor Settings"> <!ENTITY torPreferences.torSettingsDescription "Tor Browser routes your traffic over the Tor Network, run by thousands of volunteers around the world." > <!ENTITY torPreferences.learnMore "Learn More"> -<!ENTITY torPreferences.bridges "Bridges"> +<!ENTITY torPreferences.bridges "Pontes"> <!ENTITY torPreferences.bridgesDescription "Bridges help you access the Tor Network in places where Tor is blocked. Depending on where you are, one bridge may work better than another."> <!ENTITY torPreferences.useBridge "Use a bridge"> <!ENTITY torPreferences.requestNewBridge "Request a New Bridge…">

1 0

[gettor/master] Remove logging of successful db query
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 4ed0f9ae02de837cd278767fa84167c728f18879 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri May 29 15:08:11 2020 -0400 Remove logging of successful db query --- gettor/utils/db.py | 1 - 1 file changed, 1 deletion(-) diff --git a/gettor/utils/db.py b/gettor/utils/db.py index d6bf153..c2e2634 100644 --- a/gettor/utils/db.py +++ b/gettor/utils/db.py @@ -32,7 +32,6 @@ class SQLite3(object): Query callback Log that the database query has been executed and return results """ - log.msg("Database query executed successfully.") return results def query_errback(self, error=None):

1 0

[snowflake-mobile/master] Added permissions and registered the service
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 712dbdd579266bbcfc1389de15cdb5cc2aa8df87 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 03:39:51 2020 +0530 Added permissions and registered the service --- app/src/main/AndroidManifest.xml | 12 ++++++++++++ .../java/org/torproject/snowflake/MyPersistentService.java | 11 ++++++++--- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9e4b070..7728955 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,6 +2,12 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.snowflake"> + <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> + <uses-permission android:name="android.permission.INTERNET" /> + <uses-permission android:name="android.permission.WAKE_LOCK" /> + <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" /> + <application android:allowBackup="true" android:icon="@mipmap/ic_launcher" @@ -9,6 +15,12 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + <service + android:name="org.torproject.snowflake.MyPersistentService" + android:enabled="true" + android:exported="false" /> + <activity android:name=".MainActivity"> <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 5d6c03e..bdb2e54 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -29,12 +29,17 @@ public class MyPersistentService extends Service { super.onCreate(); Log.d(TAG, "onCreate: Service Created"); - sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); - sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); //Assigning the shared preferences + sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_RUNNING); //Editing the shared preferences Notification notification = createPersistentNotification(false, null); startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); } + /** + * Helper function to edit shared preference file. + * + * @param setState State from ForegroundServiceConstants + */ private void sharedPreferencesHelper(final int setState) { Log.d(TAG, "sharedPreferencesHelper: Setting Shared Preference Running To: " + setState); SharedPreferences.Editor editor = sharedPreferences.edit(); @@ -51,7 +56,7 @@ public class MyPersistentService extends Service { * Create a new persistent notification * * @param isUpdate is this new notification an update to current one? - * @param update String that is to be updated will current. Send "null" if isUpdate is false. + * @param update String that is to be updated will current. Send "null" if isUpdate is false. * @return New Notification with given parameters. */ private Notification createPersistentNotification(final boolean isUpdate, final String update) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7448d1e..d737520 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ <resources> - <string name="app_name">TestFlake</string> + <string name="app_name">Snowflake</string> <string name="sharedpreference_file">org.torproject.snowflake.snowflake_preferences</string> <string name="is_service_running_bool">is_service_running</string> <string name="not_channel_desc">This Channel should not be muted. The Android system will consider Snowflake not import and will kill the service if it\'s muted.</string>

1 0

[snowflake-mobile/master] Added stopping service function
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 07b99ebf2c066de57b8ff3bdc52e4e1c98531106 Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 04:02:15 2020 +0530 Added stopping service function --- .../torproject/snowflake/MyPersistentService.java | 57 ++++++++++++++++++++-- 1 file changed, 52 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index 5bafada..564fe03 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -7,16 +7,21 @@ import android.content.Intent; import android.content.SharedPreferences; import android.os.Build; import android.os.IBinder; +import android.os.PowerManager; import android.util.Log; import androidx.annotation.Nullable; import org.torproject.snowflake.constants.ForegroundServiceConstants; -//Main foreground service to handle network calls and to relay the data in the back ground. +/** + * Main Snowflake implementation of foreground service to relay data in the background. + */ public class MyPersistentService extends Service { private static final String TAG = "MyPersistentService"; private SharedPreferences sharedPreferences; + private boolean isServiceStarted; + private PowerManager.WakeLock wakeLock; @Nullable @Override @@ -30,12 +35,13 @@ public class MyPersistentService extends Service { sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); if (intent != null) { -// if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) -// //TODO: Start Service -// else -// //TODO: Stop Service + if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) + startService(); + else + stopService(); } else { Log.d("onStartCommand:", "Null intent detected"); //Intent is null if system restarts the service. + startService(); //Starting the service since it's a "restart" of the service. } //If the service is killed. OS will restart this service if it's START_STICKY. @@ -114,4 +120,45 @@ public class MyPersistentService extends Service { return builder.build(); } + + //Starting and stopping service + + /** + * Use to star/re-start the service + */ + private void startService() { + if (isServiceStarted) { + Log.d(TAG, "startService: Service Already running."); + return; + } + Log.d(TAG, "startService: Starting foreground service"); + isServiceStarted = true; + + PowerManager powerManager = (PowerManager) getSystemService(POWER_SERVICE); + wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, + "MyApp::MyWakelockTag"); + wakeLock.acquire(); //WakeLock acquired for unlimited amount of time. + + /// + //TODO: Start WebRTC connection. + } + + /** + * Use to stop the service. + */ + private void stopService() { + Log.d(TAG, "stopService:Stopping the foreground service"); + try { + if (wakeLock != null && wakeLock.isHeld()) { + wakeLock.release(); + } + stopForeground(true); //To remove the notification. + stopSelf(); //Calls onDestroy to destroy the service and dispose all the connections + } catch (Exception e) { + Log.d(TAG, "stopService: Failed with: " + e.getMessage()); + } + isServiceStarted = false; + } + + ///////////////////////////////////// }

1 0

[snowflake-mobile/master] Added onStartCommand to start and stop service
by cohosh＠torproject.org 05 Jun '20

05 Jun '20

commit 91871788d224ba0b4bb0956b369ea6a1345c893e Author: Hashik Donthineni <HashikDonthineni(a)gmail.com> Date: Fri Jun 5 03:52:08 2020 +0530 Added onStartCommand to start and stop service --- .../torproject/snowflake/MyPersistentService.java | 28 ++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java index bdb2e54..5bafada 100644 --- a/app/src/main/java/org/torproject/snowflake/MyPersistentService.java +++ b/app/src/main/java/org/torproject/snowflake/MyPersistentService.java @@ -25,6 +25,24 @@ public class MyPersistentService extends Service { } @Override + public int onStartCommand(Intent intent, int flags, int startId) { + Log.d(TAG, "onStartCommand: executed with startId: " + startId); + sharedPreferences = getSharedPreferences(getString(R.string.sharedpreference_file), MODE_PRIVATE); + + if (intent != null) { +// if (intent.getAction().equals(ForegroundServiceConstants.ACTION_START)) +// //TODO: Start Service +// else +// //TODO: Stop Service + } else { + Log.d("onStartCommand:", "Null intent detected"); //Intent is null if system restarts the service. + } + + //If the service is killed. OS will restart this service if it's START_STICKY. + return START_STICKY; + } + + @Override public void onCreate() { super.onCreate(); Log.d(TAG, "onCreate: Service Created"); @@ -35,6 +53,16 @@ public class MyPersistentService extends Service { startForeground(ForegroundServiceConstants.DEF_NOTIFICATION_ID, notification); } + @Override + public void onDestroy() { + Log.d(TAG, "onDestroy: Service Destroyed"); + sharedPreferencesHelper(ForegroundServiceConstants.SERVICE_STOPPED); + + //TODO: Dispose all connections. + + super.onDestroy(); + } + /** * Helper function to edit shared preference file. *

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2020