- tor-commits - lists.torproject.org

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

22 Dec '21

commit 65168659497d0d22c6b0d71ea8d99818b6150db8 Merge: 206e7ee2 2f62f17f Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:23:51 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/values-fi/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)

1 0

[orbot/master] Merge pull request #476 from SkewedZeppelin/isolatehttp
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 7d526c2ea03a181d5022f41725f3eac252e7f82c Merge: 2f62f17f 245eb345 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 2 14:25:44 2021 -0400 Merge pull request #476 from SkewedZeppelin/isolatehttp Enable IsolateDestAddr on HTTPTunnelPort if set .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] update gradle tools
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 78f0b76521655afc615026ac5171db04ec8f2f69 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:36:49 2021 -0400 update gradle tools --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 212e7ca6..3bcead6e 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } }

1 0

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

22 Dec '21

commit d55ebce9ee7ecd23af307a3e49a2a07f8803a6b8 Merge: ef0e1c24 877556a9 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:29:59 2021 -0400 Merge branch 'SkewedZeppelin-snowflakelimit' .../java/org/torproject/android/service/OrbotService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)

1 0

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

22 Dec '21

commit ef0e1c2466b4078c466cf2030b08630757271453 Merge: 65168659 ddb95c33 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:26:58 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/xml/preferences.xml | 2 +- .../src/main/java/org/torproject/android/service/OrbotService.java | 2 +- .../src/main/java/org/torproject/android/service/util/Prefs.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)

1 0

[orbot/master] fix conflict
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 877556a94a7bc3cc5a7f45a8a5f268ef588586e6 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 14:29:45 2021 -0400 fix conflict --- .../java/org/torproject/android/service/OrbotService.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 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 2bb89b26..0860bbbf 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -1549,10 +1549,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb startSnowflakeClient(); } else if (Prefs.beSnowflakeProxy()) { - if (Prefs.limitSnowflakeProxying() - && isChargingAndWifi(OrbotService.this)) { - enableSnowflakeProxy(); - } else + if (Prefs.limitSnowflakeProxying()) + { + if (isChargingAndWifi(OrbotService.this)) + { + enableSnowflakeProxy(); + } + + } + else enableSnowflakeProxy(); }

1 0

[orbot/master] Merge pull request #481 from SkewedZeppelin/snowflakelimit
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 920a4e30a6624bc79eeef252a30cf9924d348643 Merge: d55ebce9 fe38aa2d Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Fri Jul 2 14:30:18 2021 -0400 Merge pull request #481 from SkewedZeppelin/snowflakelimit Fixup snowflake limit check

1 0

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

22 Dec '21

commit 602d21151b4d533148c5da1c5c8530cf0ccf469c Merge: 78f0b765 e07c3129 Author: n8fr8 <nathan(a)guardianproject.info> Date: Fri Jul 2 16:59:54 2021 -0400 Merge branch 'main' of https://github.com/syphyr/orbot into syphyr-main orbotservice/src/main/jni/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] Translated using Weblate (Ukrainian)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 26622efeab470f82373940b1b26f98243f97f176 Author: Tymofii Lytvynenko <till.svit(a)gmail.com> Date: Fri Jul 9 05:33:35 2021 +0200 Translated using Weblate (Ukrainian) Currently translated at 100.0% (221 of 221 strings) Co-authored-by: Tymofii Lytvynenko <till.svit(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/uk/ Translation: Guardian Project/Orbot --- app/src/main/res/values-uk/strings.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 5078f361..4cde5b76 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -227,4 +227,6 @@ <string name="deny">Заборонити</string> <string name="allow">Длзволити</string> <string name="backup_port_exist">Помилка: служба Onion вже використовує порт %s</string> + <string name="be_a_snowflake_desc_limit">Тільки коли пристрій під\'єднано до мережі Wi-Fi</string> + <string name="be_a_snowflake_title_limit">Обмеження проксі Snowflake</string> </resources> \ No newline at end of file

1 0

[orbot/master] Translated using Weblate (French)
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 5943f0c1adae31317a7eab3ee59c02237eda0344 Author: AO Localisation Lab <ao(a)localizationlab.org> Date: Fri Jul 9 05:33:34 2021 +0200 Translated using Weblate (French) Currently translated at 100.0% (221 of 221 strings) Co-authored-by: AO Localisation Lab <ao(a)localizationlab.org> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/fr/ Translation: Guardian Project/Orbot --- app/src/main/res/values-fr-rFR/strings.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index fdba18d3..158ac414 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -118,7 +118,7 @@ <string name="save">Enregistrer</string> <string name="name">Nom</string> <string name="please_restart_Orbot_to_enable_the_changes">Veuillez redémarrer Orbot pour activer les changements</string> - <string name="wizard_details_msg">Orbot est une application à code source ouvert qui comprend Tor, Obfs4Proxy, BadVPN Tun2Socks et LibEvent. Elle fournit un mandataire HTTP local (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Sur un appareil débridé, Orbot peut aussi faire passer tout le trafic Internet par Tor.</string> + <string name="wizard_details_msg">Orbot est une application à code source ouvert qui comprend Tor, Obfs4Proxy, BadVPN, Tun2Socks et LibEvent. Elle fournit un mandataire HTTP local (8118) et un mandataire SOCKS (9050) vers le réseau Tor. Sur un appareil débridé, Orbot peut aussi faire passer tout le trafic Internet par Tor.</string> <string name="obfsproxy_version">Obfs4proxy : https://github.com/Yawning/obfs4</string> <string name="openssl_version">OpenSSL : http://www.openssl.org</string> <string name="hidden_service_request">Une appli veut ouvrir le serveur onion sur le port %1$s au réseau Tor. Cette action est sûre si vous faites confiance à cette appli.</string> @@ -227,4 +227,6 @@ <string name="backup_port_exist">Erreur : Un service onion utilise déjà le port %s</string> <string name="v3_backup_key">Sauvegarder la clé d’autorisation client</string> <string name="v3_onion">Domaine .onion v3</string> + <string name="be_a_snowflake_desc_limit">Seulement quand l’appareil est branché et sur le Wi-Fi</string> + <string name="be_a_snowflake_title_limit">Limites du mandataire Snowflake</string> </resources> \ No newline at end of file

1 0