- tor-commits - lists.torproject.org

[orbot/master] dns config file formatting fix
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit b3116b7c229458efc306f1394692cd9a116fca85 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:15:37 2021 -0400 dns config file formatting fix --- .../torproject/android/service/OrbotService.java | 49 +++++++++++++--------- orbotservice/src/main/res/values/pdnsd.xml | 1 - 2 files changed, 30 insertions(+), 20 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index a1af888b..483e7120 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -293,16 +293,20 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb private void stopTorAsync() { - Log.i("OrbotService", "stopTor"); + debug("stopTor"); + try { sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); - if (useIPtObfsMeekProxy()) - IPtProxy.stopObfs4Proxy(); - - if (useIPtSnowflakeProxy()) - IPtProxy.stopSnowflake(); + if (Prefs.bridgesEnabled()) { + if (useIPtObfsMeekProxy()) + IPtProxy.stopObfs4Proxy(); + else if (useIPtSnowflakeProxy()) + IPtProxy.stopSnowflake(); + } + else if (Prefs.beSnowflakeProxy()) + disableSnowflakeProxy(); stopTor(); @@ -376,7 +380,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb /* This is to host a snowflake entrance node / bridge */ - private void runSnowflakeProxy () { + private void enableSnowflakeProxy () { int capacity = 3; String broker = "https://snowflake-broker.bamsoftware.com/"; String relay = "wss://snowflake.bamsoftware.com/"; @@ -385,10 +389,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb boolean keepLocalAddresses = true; boolean unsafeLogging = false; IPtProxy.startSnowflakeProxy(capacity, broker, relay, stun, logFile, keepLocalAddresses, unsafeLogging); + + logNotice("Snowflake Proxy mode ENABLED"); } - private void stopSnowflakeProxy () { + private void disableSnowflakeProxy () { IPtProxy.stopSnowflakeProxy(); + + logNotice("Snowflake Proxy mode DISABLED"); + } /** * if someone stops during startup, we may have to wait for the conn port to be setup, so we can properly shutdown tor @@ -849,6 +858,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } conn.setEvents(events); logNotice("SUCCESS added control port event handler"); + initControlConnection(); } catch (IOException | InterruptedException e) { e.printStackTrace(); stopTorOnError(e.getLocalizedMessage()); @@ -880,6 +890,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } }; + /** BroadcastReceiver receiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { @@ -896,6 +907,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb Looper looper = handlerThread.getLooper(); Handler handler = new Handler(looper); registerReceiver(receiver, new IntentFilter(TorService.ACTION_STATUS), null, handler); + **/ Intent serviceIntent = new Intent(this, TorService.class); if (Build.VERSION.SDK_INT < 29) { @@ -1050,7 +1062,6 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb logNotice(getString(R.string.updating_settings_in_tor_service)); SharedPreferences prefs = Prefs.getSharedPrefs(getApplicationContext()); - boolean useBridges = Prefs.bridgesEnabled(); boolean becomeRelay = prefs.getBoolean(OrbotConstants.PREF_OR, false); boolean ReachableAddresses = prefs.getBoolean(OrbotConstants.PREF_REACHABLE_ADDRESSES, false); boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false); @@ -1058,7 +1069,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb String exitNodes = prefs.getString("pref_exit_nodes", ""); String excludeNodes = prefs.getString("pref_exclude_nodes", ""); - if (!useBridges) { + if (!Prefs.bridgesEnabled()) { extraLines.append("UseBridges 0").append('\n'); if (Prefs.useVpn()) { //set the proxy here if we aren't using a bridge if (!mIsLollipop) { @@ -1163,7 +1174,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } try { - if (becomeRelay && (!useBridges) && (!ReachableAddresses)) { + if (becomeRelay && (!Prefs.bridgesEnabled()) && (!ReachableAddresses)) { int ORPort = Integer.parseInt(Objects.requireNonNull(prefs.getString(OrbotConstants.PREF_OR_PORT, "9001"))); String nickname = prefs.getString(OrbotConstants.PREF_OR_NICKNAME, "Orbot"); String dnsFile = writeDNSFile(); @@ -1536,14 +1547,14 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { - if (useIPtObfsMeekProxy()) - IPtProxy.startObfs4Proxy("DEBUG", false, false); - - if (useIPtSnowflakeProxy()) - startSnowflakeClient(); - - if (Prefs.beSnowflakeProxy()) - runSnowflakeProxy(); + if (Prefs.bridgesEnabled()) { + if (useIPtObfsMeekProxy()) + IPtProxy.startObfs4Proxy("DEBUG", false, false); + else if (useIPtSnowflakeProxy()) + startSnowflakeClient(); + } + else if (Prefs.beSnowflakeProxy()) + enableSnowflakeProxy(); startTor(); replyWithStatus(mIntent); diff --git a/orbotservice/src/main/res/values/pdnsd.xml b/orbotservice/src/main/res/values/pdnsd.xml index ce4609bc..3b5bb7ad 100644 --- a/orbotservice/src/main/res/values/pdnsd.xml +++ b/orbotservice/src/main/res/values/pdnsd.xml @@ -12,7 +12,6 @@ global { timeout=10; daemon=on; pid_file="%3$s/pdnsd.pid"; - } server {

1 0

[orbot/master] latest changelog additions
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ed5833e1e8bd7ecd84b82af71410afc4fd3a01c0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:16:00 2021 -0400 latest changelog additions --- CHANGELOG | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 8347f31f..965d3f97 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,69 @@ +/** 16.5.0-ALPHA-1 2 June 2021 **/ + +5e3963d8 (HEAD -> master, tag: 16.5.0-ALPHA-2-tor.0.4.5.7) update Orbot to 1650200100 +71545226 (origin/master, origin/HEAD) Merge branch 'bitmold-tor_event_bandwidth' +491e3572 (bitmold-tor_event_bandwidth) bandwidth propagates correctly from TorEventHandler -> OrbotService -> OrbotMainActivity +2519bb35 consistent data transfer logic in service, makes units in notiifcation accurate +2041ec1d not needed in appcore build.gradle +a348217e comment no longer needed with IPtProxy sources being hosted +56e08141 removed obsolete method +5fc9f872 Merge branch 'bitmold-IPtProxyPorts' +99f2aa53 (bitmold-IPtProxyPorts) update bridge line for snowflake +08b79c4b add fingerprint to bridge config https://gitlab.torproject.org/tpo/anti-censorship/pluggable-transports/snow… +a36c8391 Merge branch 'IPtProxyPorts' of https://github.com/bitmold/orbot into bitmold-IPtProxyPorts +fe196385 IPtProxy 1.0.0 +0d950796 make calls to start and stop synchronized +88553b18 Merge branch 'IPtProxyPorts' of https://github.com/bitmold/orbot into bitmold-IPtProxyPorts +4f8982e0 Orbot changes for new verison of IPtProxy that dynamically picks ports +18fc0453 mini build should exclude PT support +b8dbbcca (newport/master) added new app-tv module, updated app-mini +efe44dc0 update app-mini to mini-1.0.0-BETA-2-tor-0.4.5.7 +c3631e4c fix app config layout +e6fb6252 Merge branch 'master' of github.com:guardianproject/orbot +976b0340 update app-mini to work with latest OrbotService +0e39a777 add overall preference for enabling/disabling onion service hosting +c7bb4ec9 fixed broken newnym btn on main activity +e9d71feb Merge pull request #459 from eighthave/weblate +c6dab304 update orbotservice target SDK to 30 to match the app +377fd63c remove gpmaven repo, get jsockAndroid directly via jitpack.io +2a466241 Translated using Weblate (Vietnamese) +14fa245e Translated using Weblate (Portuguese) +8ecb756f Translated using Weblate (Portuguese (Portugal)) +6793a99a Translated using Weblate (Portuguese (Brazil)) +3055933f Translated using Weblate (Norwegian Bokmål) +2648b294 (tag: 16.5.0-ALPHA-1-tor.0.4.5.7) update version to 1650100100 (16.5 alpha 1) +d2d85aaa Merge pull request #457 from eighthave/jcenter-gpmaven-migration +839c3787 Merge branch 'eighthave-master' +dd7152e9 (eighthave-master) Merge branch 'master' of https://github.com/eighthave/orbot into eighthave-master +aa643f4a Merge pull request #456 from eighthave/lint-fixes +a6cd5b00 start migration away from jcenter and gpmaven repos +40c3da9d use tor-android and jtorctl v0.4.5.7 +c90c51aa gitlab-ci: quiet unzip output +374e093c put all Control Port event registration onServiceConnected() +c41f8e88 fix lint StringFormatMatches: bad format type, was String should be int +9b483cfd get geoip files as JARs from jcenter Maven repo +afb3ae78 use new jtorctl constants for Tor event names +f7384977 use new jtorctl constants for Tor signal names +c229771b switch to native TorService +df577415 purge unused test code, including old copy of jtorctl +2c9e02bd switch to new jtorctl version to support TorService +3cf3f968 fix lint Typo: internett -> Internett +95f318ca "id" is a long deprecated locale for Indonesian. "in" is canonical +9fe04093 "he" is a long deprecated locale for Hebrew. "iw" is canonical +3c401120 update gradle wrapper to match gradle version +4a8c8f75 Merge pull request #455 from weblate/weblate-guardianproject-orbot +c90508fd Translated using Weblate (Chinese (Simplified)) +cb7a0d56 Translated using Weblate (Ukrainian) +13f646ab Translated using Weblate (Icelandic) +80f06beb Translated using Weblate (French) +9ebe5fe5 Translated using Weblate (Portuguese (Brazil)) +68596948 Translated using Weblate (Ukrainian) +802da569 Translated using Weblate (Turkish) +f1714076 Translated using Weblate (Norwegian Bokmål) +b87b6eb4 removed me from FUNDING.yml +6bff3434 Show both local port and "onion port" on hosted v2 and v3 onion services +df8360b4 remove unneeded old obfs4proxy library references + /** 16.4.1-RC-1 / 9 April 2021 / c80f18ae2508b73fcbfd6e09b394a2a196de7459 **/ c80f18ae (HEAD -> master, tag: 16.4.1-RC-1-tor.0.4.4.6) update version code to 1641300100

1 0

[orbot/master] Merge branch 'master' of github.com:guardianproject/orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 589df2a9a391317446f181d63e6fe634fd44dd60 Merge: ed5833e1 ace8a88e Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:16:10 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot README.md | 12 ++++++------ app-mini/src/main/res/layout/layout_about.xml | 7 ------- app-mini/src/main/res/values-ar/strings.xml | 1 - app-mini/src/main/res/values-ay/strings.xml | 3 +-- app-mini/src/main/res/values-az/strings.xml | 1 - app-mini/src/main/res/values-be/strings.xml | 3 +-- app-mini/src/main/res/values-bg/strings.xml | 1 - app-mini/src/main/res/values-ca/strings.xml | 3 +-- app-mini/src/main/res/values-cs-rCZ/strings.xml | 1 - app-mini/src/main/res/values-de/strings.xml | 3 +-- app-mini/src/main/res/values-el/strings.xml | 3 +-- app-mini/src/main/res/values-en-rGB/strings.xml | 2 +- app-mini/src/main/res/values-es-rAR/strings.xml | 3 +-- app-mini/src/main/res/values-es/strings.xml | 3 +-- app-mini/src/main/res/values-eu/strings.xml | 3 +-- app-mini/src/main/res/values-fa/strings.xml | 3 +-- app-mini/src/main/res/values-fi/strings.xml | 1 - app-mini/src/main/res/values-fr-rFR/strings.xml | 1 - app-mini/src/main/res/values-fr/strings.xml | 3 +-- app-mini/src/main/res/values-gl/strings.xml | 3 +-- app-mini/src/main/res/values-hi/strings.xml | 1 - app-mini/src/main/res/values-hr/strings.xml | 1 - app-mini/src/main/res/values-hu/strings.xml | 3 +-- app-mini/src/main/res/values-in/strings.xml | 1 - app-mini/src/main/res/values-is/strings.xml | 3 +-- app-mini/src/main/res/values-it/strings.xml | 3 +-- app-mini/src/main/res/values-iw/strings.xml | 3 +-- app-mini/src/main/res/values-ja/strings.xml | 3 +-- app-mini/src/main/res/values-ko/strings.xml | 1 - app-mini/src/main/res/values-lt/strings.xml | 2 +- app-mini/src/main/res/values-lv/strings.xml | 1 - app-mini/src/main/res/values-mk/strings.xml | 3 +-- app-mini/src/main/res/values-nb/strings.xml | 1 - app-mini/src/main/res/values-nl/strings.xml | 3 +-- app-mini/src/main/res/values-pl/strings.xml | 1 - app-mini/src/main/res/values-pt-rBR/strings.xml | 3 +-- app-mini/src/main/res/values-pt-rPT/strings.xml | 1 - app-mini/src/main/res/values-pt/strings.xml | 1 - app-mini/src/main/res/values-ro/strings.xml | 1 - app-mini/src/main/res/values-ru/strings.xml | 3 +-- app-mini/src/main/res/values-sk/strings.xml | 1 - app-mini/src/main/res/values-sr/strings.xml | 3 +-- app-mini/src/main/res/values-sv/strings.xml | 3 +-- app-mini/src/main/res/values-th/strings.xml | 3 +-- app-mini/src/main/res/values-tl/strings.xml | 1 - app-mini/src/main/res/values-tr/strings.xml | 3 +-- app-mini/src/main/res/values-uk/strings.xml | 3 +-- app-mini/src/main/res/values-vi/strings.xml | 1 - app-mini/src/main/res/values-zh-rCN/strings.xml | 1 - app-mini/src/main/res/values-zh-rTW/strings.xml | 3 +-- app-mini/src/main/res/values/strings.xml | 3 +-- app-tv/src/main/res/layout/layout_about.xml | 7 ------- app-tv/src/main/res/values-ar/strings.xml | 1 - app-tv/src/main/res/values-ay/strings.xml | 3 +-- app-tv/src/main/res/values-az/strings.xml | 1 - app-tv/src/main/res/values-be/strings.xml | 3 +-- app-tv/src/main/res/values-bg/strings.xml | 1 - app-tv/src/main/res/values-ca/strings.xml | 3 +-- app-tv/src/main/res/values-cs-rCZ/strings.xml | 1 - app-tv/src/main/res/values-de/strings.xml | 3 +-- app-tv/src/main/res/values-el/strings.xml | 3 +-- app-tv/src/main/res/values-en-rGB/strings.xml | 2 +- app-tv/src/main/res/values-es-rAR/strings.xml | 3 +-- app-tv/src/main/res/values-es/strings.xml | 3 +-- app-tv/src/main/res/values-eu/strings.xml | 3 +-- app-tv/src/main/res/values-fa/strings.xml | 3 +-- app-tv/src/main/res/values-fi/strings.xml | 1 - app-tv/src/main/res/values-fr-rFR/strings.xml | 1 - app-tv/src/main/res/values-fr/strings.xml | 3 +-- app-tv/src/main/res/values-gl/strings.xml | 3 +-- app-tv/src/main/res/values-hi/strings.xml | 1 - app-tv/src/main/res/values-hr/strings.xml | 1 - app-tv/src/main/res/values-hu/strings.xml | 3 +-- app-tv/src/main/res/values-in/strings.xml | 1 - app-tv/src/main/res/values-is/strings.xml | 3 +-- app-tv/src/main/res/values-it/strings.xml | 3 +-- app-tv/src/main/res/values-iw/strings.xml | 3 +-- app-tv/src/main/res/values-ja/strings.xml | 3 +-- app-tv/src/main/res/values-ko/strings.xml | 1 - app-tv/src/main/res/values-lt/strings.xml | 2 +- app-tv/src/main/res/values-lv/strings.xml | 1 - app-tv/src/main/res/values-mk/strings.xml | 3 +-- app-tv/src/main/res/values-nb/strings.xml | 1 - app-tv/src/main/res/values-nl/strings.xml | 3 +-- app-tv/src/main/res/values-pl/strings.xml | 1 - app-tv/src/main/res/values-pt-rBR/strings.xml | 3 +-- app-tv/src/main/res/values-pt-rPT/strings.xml | 1 - app-tv/src/main/res/values-pt/strings.xml | 1 - app-tv/src/main/res/values-ro/strings.xml | 1 - app-tv/src/main/res/values-ru/strings.xml | 3 +-- app-tv/src/main/res/values-sk/strings.xml | 1 - app-tv/src/main/res/values-sr/strings.xml | 3 +-- app-tv/src/main/res/values-sv/strings.xml | 3 +-- app-tv/src/main/res/values-th/strings.xml | 3 +-- app-tv/src/main/res/values-tl/strings.xml | 1 - app-tv/src/main/res/values-tr/strings.xml | 3 +-- app-tv/src/main/res/values-uk/strings.xml | 3 +-- app-tv/src/main/res/values-vi/strings.xml | 1 - app-tv/src/main/res/values-zh-rCN/strings.xml | 1 - app-tv/src/main/res/values-zh-rTW/strings.xml | 3 +-- app-tv/src/main/res/values/strings.xml | 3 +-- app/src/main/res/values-ay/strings.xml | 2 +- app/src/main/res/values-be/strings.xml | 2 +- app/src/main/res/values-ca/strings.xml | 4 ++-- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-el/strings.xml | 4 ++-- app/src/main/res/values-en-rGB/strings.xml | 4 ++-- app/src/main/res/values-es-rAR/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 4 ++-- app/src/main/res/values-eu/strings.xml | 4 ++-- app/src/main/res/values-fa/strings.xml | 4 ++-- app/src/main/res/values-fi/strings.xml | 4 ++-- app/src/main/res/values-fr/strings.xml | 2 +- app/src/main/res/values-gl/strings.xml | 4 ++-- app/src/main/res/values-hu/strings.xml | 4 ++-- app/src/main/res/values-is/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 4 ++-- app/src/main/res/values-iw/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 4 ++-- app/src/main/res/values-lt/strings.xml | 2 +- app/src/main/res/values-mk/strings.xml | 4 ++-- app/src/main/res/values-nb/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 4 ++-- app/src/main/res/values-pl/strings.xml | 4 ++-- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-pt-rPT/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 4 ++-- app/src/main/res/values-sk-rSK/strings.xml | 4 ++-- app/src/main/res/values-sr/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 4 ++-- app/src/main/res/values-th/strings.xml | 4 ++-- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 4 ++-- app/src/main/res/values-zh-rTW/strings.xml | 2 +- app/src/main/res/values/strings.xml | 2 +- 138 files changed, 120 insertions(+), 228 deletions(-)

1 0

[orbot/master] must use youtube for video links for play store
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fac3b20621cfe371d5f90d4adf5d9fb7af7a7d5e Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:19:16 2021 -0400 must use youtube for video links for play store --- fastlane/metadata/android/id/video.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/android/id/video.txt b/fastlane/metadata/android/id/video.txt index ea3aaa00..d1fd7aff 100644 --- a/fastlane/metadata/android/id/video.txt +++ b/fastlane/metadata/android/id/video.txt @@ -1 +1 @@ -https://invidio.us/watch?v=mS1gstS6YS8 +https://www.youtube.com/watch?v=JWII85UlzKw

1 0

[orbot/master] Merge branch 'weblate-guardianproject-orbot' of https://github.com/weblate/orbot into weblate-weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit cadeee4b3330acc956b8114dff45f5205ad3a36d Merge: 589df2a9 c3ff9b75 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:19:12 2021 -0400 Merge branch 'weblate-guardianproject-orbot' of https://github.com/weblate/orbot into weblate-weblate-guardianproject-orbot app/src/main/res/values-de/strings.xml | 50 +++++-- app/src/main/res/values-fr-rFR/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 211 ++++++++++++++++------------- app/src/main/res/values-iw/strings.xml | 150 ++++++++++---------- app/src/main/res/values-ms-rMY/strings.xml | 151 +++++++++++---------- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- fastlane/metadata/android/id/video.txt | 2 +- 10 files changed, 316 insertions(+), 258 deletions(-) diff --cc app/src/main/res/values-iw/strings.xml index 89a9abdd,4b884160..e5b6b509 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@@ -30,66 -30,72 +30,72 @@@   <string name="pref_node_configuration">הגדרות Node</string> - <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string> - <string name="pref_entrance_node">Entrance Nodes</string> - <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string> - <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string> + <string name="pref_node_configuration_summary">קיימות הגדרות מתקדמות שיכולות להפחית את האנונימיות שלך</string> + <string name="pref_entrance_node">Entrance Nodes</string> + <string name="pref_entrance_node_summary">טביעות אצבע, כינויים, ארצות וכתובות עבור המעבר הראשון</string> + <string name="pref_entrance_node_dialog">הכנס Entrance Nodes</string> <string name="pref_proxy_type_title">Outbound Proxy Type</string> - <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי: HTTP, HTTPS, Socks4,Socks5</string> - <string name="pref_proxy_type_dialog">סוג הפרוקסי</string> - <string name="pref_proxy_host_title">מארח של Outbound Proxy</string> - <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string> - <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string> - <string name="pref_proxy_port_title">פורט של Outbound Proxy</string> - <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string> - <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string> - <string name="pref_proxy_username_title">שם משתמש של Outbound Proxy</string> - <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string> - <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string> - <string name="pref_proxy_password_title">סיסמא של Outbound Proxy</string> - <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string> - <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string> + <string name="pref_proxy_type_summary">פרוטוקול שימוש בשרת פרוקסי: HTTP, HTTPS, Socks4,Socks5</string> + <string name="pref_proxy_type_dialog">סוג הפרוקסי</string> + <string name="pref_proxy_host_title">מארח של Outbound Proxy</string> + <string name="pref_proxy_host_summary">שם מארח שרת פרוקסי</string> + <string name="pref_proxy_host_dialog">הכנס מארח פרוקסי</string> + <string name="pref_proxy_port_title">פורט של Outbound Proxy</string> + <string name="pref_proxy_port_summary">פורט שרת פרוקסי</string> + <string name="pref_proxy_port_dialog">הכנס פורט של פרוקסי</string> + <string name="pref_proxy_username_title">שם משתמש של Outbound Proxy</string> + <string name="pref_proxy_username_summary">שם משתמש פרוקסי (רשות)</string> + <string name="pref_proxy_username_dialog">הזן שם משתמש פרוקסי</string> + <string name="pref_proxy_password_title">סיסמא של Outbound Proxy</string> + <string name="pref_proxy_password_summary">סיסמת פרוקסי (רשות)</string> + <string name="pref_proxy_password_dialog">הזן סיסמת פרוקסי</string> <string name="couldn_t_start_tor_process_">אין אפשרות להתחיל תהליך Tor:</string> <string name="error">שגיאה</string> - <string name="exit_nodes">צמתי יציאה</string> - <string name="enter_exit_nodes">הזן צמתי יציאה</string> - <string name="exclude_nodes">צמתים מוצאים</string> - <string name="enter_exclude_nodes">הזן צמתים מוצאים</string> - <string name="strict_nodes">צמתים קפדנים</string> - <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string> - <string name="bridges">גשרים</string> - <string name="use_bridges">השתמש בגשרים</string> - <string name="relays">ממסרים</string> - <string name="relaying">ממסור</string> - <string name="enable_your_device_to_be_a_non_exit_relay">אפשר למכשיר שלך להיות תחנת ממסר שאיננה יציאה</string> - <string name="relay_port">פורט הממסר</string> - <string name="listening_port_for_your_tor_relay">פורט מאזין עבור Tor relay</string> - <string name="enter_or_port"> הכנס יציאת OR</string> - <string name="relay_nickname">כינוי הממסר</string> - <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string> - <string name="enter_a_custom_relay_nickname">הזן כינוי עבור ממסר</string> - <string name="reachable_addresses">כתובות בהישג יד</string> - <string name="reachable_ports">פורטים בהישג יד</string> - <string name="enter_ports">הזן פורטים</string> + <string name="exit_nodes">צמתי יציאה</string> + <string name="enter_exit_nodes">הזן צמתי יציאה</string> + <string name="exclude_nodes">צמתים מוחרגים</string> + <string name="enter_exclude_nodes">הזן צמתים מוחרגים</string> + <string name="strict_nodes">צמתים קפדנים</string> + <string name="use_only_these_specified_nodes">השתמש *רק* בצמתים מצוינים אלו</string> + <string name="bridges">גשרים</string> + <string name="use_bridges">השתמש בגשרים</string> + <string name="relays">ממסרים</string> + <string name="relaying">ממסור</string> + <string name="enable_your_device_to_be_a_non_exit_relay">אפשר למכשיר שלך להיות תחנת ממסר שאיננה יציאה</string> + <string name="relay_port">פורט הממסר</string> + <string name="listening_port_for_your_tor_relay">פורט מאזין עבור Tor relay</string> + <string name="enter_or_port"> הכנס יציאת OR</string> + <string name="relay_nickname">כינוי הממסר</string> + <string name="the_nickname_for_your_tor_relay">הכינוי לממסר Tor שלך</string> + <string name="enter_a_custom_relay_nickname">הזן כינוי עבור ממסר</string> + <string name="reachable_addresses">כתובות בהישג יד</string> + <string name="reachable_ports">פורטים בהישג יד</string> + <string name="enter_ports">הזן פורטים</string> <string name="project_home">אתרי הפרויקט:</string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="third_party_software">תוכנה-צד-ג׳: </string> - <string name="tor_version">Tor: https://www.torproject.org</string> - <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> + <string name="tor_version">Tor: https://www.torproject.org</string> + <string name="libevent_version">LibEvent v2.0.21: http://www.monkey.org/~provos/libevent/</string> <string name="found_existing_tor_process">נמצא תהליך Tor קיים…</string> - <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string> + <string name="something_bad_happened">משהו רע התרחש. בדוק את היומן</string> <string name="unable_to_read_hidden_service_name">לא מסוגל לקרוא שם שירות נסתר</string> - <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string> + <string name="unable_to_start_tor">לא מסוגל להתחיל את Tor:</string> <string name="pref_use_persistent_notifications">לשמור תמיד את האיקון בסרגל כלים כשאורבוט מחובר</string> <string name="set_locale_title">שפה</string> - <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string> - <string name="newnym">החלפת אל זהות Tor חדשה!</string> - <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string> - <string name="pref_socks_title">Tor SOCKS</string> - <string name="pref_socks_dialog">הגדרות SOCKS Port </string> - <string name="pref_transport_title">Tor TransProxy Port</string> - <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string> - <string name="pref_dnsport_title">Tor DNS Port</string> + <string name="pref_disable_network_summary">כבה את Tor כאשר אין חיבור לאינטרנט</string> + <string name="newnym">החלפת אל זהות Tor חדשה!</string> + <string name="updating_settings_in_tor_service">מעדכן הגדרות Tor במכשיר</string> + <string name="pref_socks_title">Tor SOCKS</string> + <string name="pref_socks_dialog">הגדרות SOCKS Port </string> + <string name="pref_transport_title">Tor TransProxy Port</string> + <string name="pref_transport_dialog">הגדרת הפורט של TransProxy</string> + <string name="pref_dnsport_title">Tor DNS Port</string> <string name="get_bridges_email">דוא\"ל</string> - <string name="send_email">שלח דוא\"ל</string> + <string name="send_email">שלח דוא\"ל</string> + <string name="your_relay_settings_caused_an_exception_">הגדרות הממסר שלך גרמו לתקלה!</string> + <string name="your_reachableaddresses_settings_caused_an_exception_">הגדרות הכתובת הנגישה שלך גרמו לתקלה!</string> + <string name="pref_proxy_title">מתווך רשת ליציאה (רשות)</string> + <string name="pref_allow_background_starts_summary">לאפשר לכל יישומון להפעיל את Tor ואת השירותים הקשורים</string> + <string name="pref_allow_background_starts_title">לאפשר הפעלות ברקע</string> + <string name="status_shutting_down">שירות Tor נכבה</string> -</resources> +</resources>

1 0

[orbot/master] Enable IsolateDestAddr on HTTPTunnelPort if set
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 245eb345b0f3af3aaffbc743d56dc1b1b3f5cdea Author: Tad <tad(a)spotco.us> Date: Wed Jun 23 07:40:43 2021 -0400 Enable IsolateDestAddr on HTTPTunnelPort if set Closes https://github.com/guardianproject/orbot/issues/469 --- .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 483e7120..4ef7b3d5 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -573,7 +573,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb extraLines.append("SocksListenAddress 0.0.0.0").append('\n'); - extraLines.append("HTTPTunnelPort ").append(httpPortPref).append('\n'); + extraLines.append("HTTPTunnelPort ").append(httpPortPref).append(isolate).append('\n'); if (prefs.getBoolean(OrbotConstants.PREF_CONNECTION_PADDING, false)) { extraLines.append("ConnectionPadding 1").append('\n');

1 0

[orbot/master] Merge branch 'weblate-weblate-guardianproject-orbot'
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0636eacb695c89fd419be31294477a271a2bd9bf Merge: 589df2a9 fac3b206 Author: n8fr8 <nathan(a)guardianproject.info> Date: Thu Jun 17 17:19:40 2021 -0400 Merge branch 'weblate-weblate-guardianproject-orbot' app/src/main/res/values-de/strings.xml | 50 +++++-- app/src/main/res/values-fr-rFR/strings.xml | 2 +- app/src/main/res/values-in/strings.xml | 211 ++++++++++++++++------------- app/src/main/res/values-iw/strings.xml | 150 ++++++++++---------- app/src/main/res/values-ms-rMY/strings.xml | 151 +++++++++++---------- app/src/main/res/values-pt-rBR/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-zh-rCN/strings.xml | 2 +- 9 files changed, 315 insertions(+), 257 deletions(-)

1 0

[orbot/master] only provide 1 snowlake proxy connection at a time
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit f313d83f9a6a7ffe0fad20a5fb94069e297d6a29 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jun 28 23:00:09 2021 -0400 only provide 1 snowlake proxy connection at a time --- .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 9ebd506f..c7d455f7 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -383,7 +383,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb This is to host a snowflake entrance node / bridge */ private void enableSnowflakeProxy () { - int capacity = 3; + int capacity = 1; String broker = "https://snowflake-broker.bamsoftware.com/"; String relay = "wss://snowflake.bamsoftware.com/"; String stun = "stun:stun.stunprotocol.org:3478";

1 0

[orbot/master] Fixup snowflake limit check
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit fe38aa2d5c27af367a24b8c5aeaf296ed03dcca6 Author: Tad <tad(a)spotco.us> Date: Tue Jun 29 15:04:44 2021 -0400 Fixup snowflake limit check --- .../main/java/org/torproject/android/service/OrbotService.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 9ebd506f..24567591 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1558,10 +1558,13 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb else if (Prefs.beSnowflakeProxy()) { - if (Prefs.limitSnowflakeProxying() - && isChargingAndWifi(OrbotService.this)) + if (Prefs.limitSnowflakeProxying()) { - enableSnowflakeProxy(); + if (isChargingAndWifi(OrbotService.this)) + { + enableSnowflakeProxy(); + } + } else enableSnowflakeProxy();

1 0

[orbot/master] enable limit snowflake proxy mode to plugged in and unmetered connections
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit a398b44641b819468256e721351dc45794a77b74 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Jun 28 22:58:11 2021 -0400 enable limit snowflake proxy mode to plugged in and unmetered connections --- app/src/main/AndroidManifest.xml | 2 ++ app/src/main/res/values/strings.xml | 5 ++++ app/src/main/res/xml/preferences.xml | 10 +++++--- .../torproject/android/service/OrbotService.java | 27 +++++++++++++++++++++- .../org/torproject/android/service/util/Prefs.java | 6 +++++ 5 files changed, 46 insertions(+), 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3bbaf610..2a98ad6f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,6 +16,8 @@ <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> + <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" /> + <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" android:maxSdkVersion="18" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 70efb465..94cfc800 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -265,4 +265,9 @@ <string name="bridge_snowflake">Connect through other Tor peers (experimental)</string> <string name="be_a_snowflake_title">Run Snowflake Proxy</string> <string name="be_a_snowflake_desc">Allow other Tor users to connect to Tor through your device</string> + + <string name="be_a_snowflake_title_limit">Snowflake Proxy Limits</string> + <string name="be_a_snowflake_desc_limit">Only when device is plugged in and on wifi</string> + + </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index f273f318..ce5b1bbc 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -295,9 +295,13 @@ <CheckBoxPreference android:defaultValue="false" android:key="pref_be_a_snowflake" - android:summary="@string/be_a_snowflake_title" - android:title="@string/be_a_snowflake_desc" /> - + android:title="@string/be_a_snowflake_title" + android:summary="@string/be_a_snowflake_desc" /> + <CheckBoxPreference + android:defaultValue="false" + android:key="pref_be_a_snowflake_limit" + android:title="@string/be_a_snowflake_title_limit" + android:summary="@string/be_a_snowflake_desc_limit" /> </PreferenceCategory> </PreferenceScreen> diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java index 483e7120..9ebd506f 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -26,8 +26,10 @@ import android.content.ServiceConnection; import android.content.SharedPreferences; import android.content.pm.PackageManager; import android.database.Cursor; +import android.net.ConnectivityManager; import android.net.Uri; import android.net.VpnService; +import android.os.BatteryManager; import android.os.Build; import android.os.Handler; import android.os.HandlerThread; @@ -1554,7 +1556,16 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb startSnowflakeClient(); } else if (Prefs.beSnowflakeProxy()) - enableSnowflakeProxy(); + { + + if (Prefs.limitSnowflakeProxying() + && isChargingAndWifi(OrbotService.this)) + { + enableSnowflakeProxy(); + } + else + enableSnowflakeProxy(); + } startTor(); replyWithStatus(mIntent); @@ -1608,6 +1619,20 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } } + public static boolean isChargingAndWifi(Context context) { + Intent intent = context.registerReceiver(null, new IntentFilter(Intent.ACTION_BATTERY_CHANGED)); + int plugged = intent.getIntExtra(BatteryManager.EXTRA_PLUGGED, -1); + boolean isCharging = plugged == BatteryManager.BATTERY_PLUGGED_AC || plugged == BatteryManager.BATTERY_PLUGGED_USB || plugged == BatteryManager.BATTERY_PLUGGED_WIRELESS; + + ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE); + + boolean isUnmetered = cm.getActiveNetworkInfo() != null + && cm.getActiveNetworkInfo().isConnected() + && (!cm.isActiveNetworkMetered()); + + return isCharging && isUnmetered; + } + private class ActionBroadcastReceiver extends BroadcastReceiver { public void onReceive(Context context, Intent intent) { switch (intent.getAction()) { diff --git a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java index 5c36793d..5fa167c2 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java +++ b/orbotservice/src/main/java/org/torproject/android/service/util/Prefs.java @@ -21,6 +21,8 @@ public class Prefs { private final static String PREF_USE_VPN = "pref_vpn"; private final static String PREF_EXIT_NODES = "pref_exit_nodes"; private final static String PREF_BE_A_SNOWFLAKE = "pref_be_a_snowflake"; + private final static String PREF_BE_A_SNOWFLAKE_LIMIT = "pref_be_a_snowflake_limit"; + private final static String PREF_HOST_ONION_SERVICES = "pref_host_onionservices"; @@ -80,6 +82,10 @@ public class Prefs { putBoolean(PREF_BE_A_SNOWFLAKE,beSnowflakeProxy); } + public static boolean limitSnowflakeProxying () { + return prefs.getBoolean(PREF_BE_A_SNOWFLAKE_LIMIT,false); + } + public static void setDefaultLocale(String value) { putString(PREF_DEFAULT_LOCALE, value); }

1 0