December 2021 - tor-commits - lists.torproject.org

[orbot/master] Merge branch 'master' into fix_519_exit_icon
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 3b81a4e05301a27634d7a5c18e4460358d2aabe7 Merge: 03152454 af5f9ef6 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Sep 28 08:59:27 2021 -0400 Merge branch 'master' into fix_519_exit_icon app-mini/build.gradle | 30 ++++---- app-tv/build.gradle | 27 ++++---- app/build.gradle | 34 +++++---- app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values-fi/strings.xml | 81 +++++++++++++++++++++- app/src/main/res/values-it/strings.xml | 44 +++++++++++- app/src/main/res/values-iw/strings.xml | 3 + app/src/main/res/values-lt-rLT/strings.xml | 50 ++++++------- app/src/main/res/values-pl/strings.xml | 4 ++ app/src/main/res/values-ro-rRO/strings.xml | 7 +- app/src/main/res/values-uk/strings.xml | 2 +- app/src/main/res/values-vi/strings.xml | 3 +- appcore/build.gradle | 10 +-- .../android/core/ExampleInstrumentedTest.kt | 24 ------- .../org/torproject/android/core/ExampleUnitTest.kt | 17 ----- build.gradle | 1 - commons-device.gradle | 1 - .../metadata/android/fi-FI/full_description.txt | 30 ++++---- .../metadata/android/fi-FI/short_description.txt | 2 +- fastlane/metadata/android/fi-FI/title.txt | 2 +- .../metadata/android/it-IT/changelogs/16123000.txt | 2 + .../metadata/android/it-IT/short_description.txt | 2 +- .../metadata/android/lt/changelogs/15500000.txt | 4 +- .../metadata/android/lt/changelogs/15500001.txt | 4 +- .../metadata/android/lt/changelogs/1641200200.txt | 2 +- fastlane/metadata/android/lt/full_description.txt | 6 +- fastlane/metadata/android/ro/short_description.txt | 2 +- fastlane/metadata/android/ro/title.txt | 2 +- gradle/libs.versions.toml | 55 +++++++++++++++ gradle/wrapper/gradle-wrapper.properties | 4 +- intentintegrator/build.gradle | 2 +- orbotservice/build.gradle | 19 +++-- settings.gradle | 9 +++ 33 files changed, 310 insertions(+), 177 deletions(-)

1 0

[orbot/master] handle geoip failed loading and other potential NPE
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit d119de00600efb0e235246abf03979c7e7371eb5 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 26 09:03:36 2021 -0400 handle geoip failed loading and other potential NPE --- .../org/torproject/android/service/OrbotService.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 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 e90be3f3..e02c6f1d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -469,8 +469,15 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (Build.VERSION.SDK_INT >= 26) createNotificationChannel(); - CustomTorResourceInstaller installer = new CustomTorResourceInstaller(this, appBinHome); - installer.installGeoIP(); + try { + CustomTorResourceInstaller installer = new CustomTorResourceInstaller(this, appBinHome); + installer.installGeoIP(); + } + catch (IOException io) + { + Log.e(OrbotConstants.TAG, "Error installing geoip files", io); + logNotice("There was an error installing geoip files"); + } pluggableTransportInstall(); @@ -480,8 +487,8 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } catch (Exception e) { //what error here - Log.e(OrbotConstants.TAG, "Error installing Orbot binaries", e); - logNotice("There was an error installing Orbot binaries"); + Log.e(OrbotConstants.TAG, "Error installing setting up Orbot", e); + logNotice("There was an error setting up Orbot"); } Log.i("OrbotService", "onCreate end"); @@ -960,7 +967,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb LocalBroadcastManager.getInstance(this).sendBroadcast(intent); - if (Prefs.useVpn()) + if (Prefs.useVpn() && mVpnManager != null) mVpnManager.handleIntent(new Builder(), intent); }

1 0

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

22 Dec '21

commit 3ad3f1dfe2f9b789cfc8ef682295f545fb402f2a Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 26 08:49:46 2021 -0400 update library versions --- build.gradle | 4 ++-- gradle/libs.versions.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index ecb8ab1f..1e39b78d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - kotlin_version = '1.5.20' + kotlin_version = '1.5.31' } repositories { mavenCentral() @@ -9,7 +9,7 @@ buildscript { maven { url 'https://jitpack.io' } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0' + classpath 'com.android.tools.build:gradle:7.0.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index bcf9ea29..a48d82b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,7 +22,7 @@ guardian-jsocks-version = "1.0.4" guardian-jtorctl-version = "0.4.5.7" ipt-proxy-version = "1.0.0" portmapper-version = "2.0.5" -tor-android-version = "0.4.5.9" +tor-android-version = "0.4.6.10" [libraries] android-material = { module = "com.google.android.material:material", version.ref = "android-material-version" } @@ -52,4 +52,4 @@ portmapper = { module = "com.offbynull.portmapper:portmapper", version.ref = "po tor-android = { module = "info.guardianproject:tor-android", version.ref = "tor-android-version" } [bundles] -leanback= ["androidx-leanback-core", "androidx-leanback-paging", "androidx-leanback-preferences", "androidx-leanback-tab"] \ No newline at end of file +leanback= ["androidx-leanback-core", "androidx-leanback-paging", "androidx-leanback-preferences", "androidx-leanback-tab"]

1 0

[orbot/master] Merge pull request #534 from weblate/weblate-guardianproject-orbot
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2ee2955e5a20f8a7a1fb2acec065c1fb040d082b Merge: e815bc07 a23f02b2 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Oct 19 14:10:35 2021 -0400 Merge pull request #534 from weblate/weblate-guardianproject-orbot Translations update from Weblate app/src/main/res/values-pt-rBR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

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

22 Dec '21

commit a23f02b23801475ff22de2f93af52e256eb56820 Author: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Date: Tue Oct 19 06:41:56 2021 +0200 Translated using Weblate (Portuguese (Brazil)) Currently translated at 100.0% (222 of 222 strings) Co-authored-by: Wellington Terumi Uemura <wellingtonuemura(a)gmail.com> Translate-URL: https://hosted.weblate.org/projects/guardianproject/orbot/pt_BR/ Translation: Guardian Project/Orbot --- app/src/main/res/values-pt-rBR/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index bd62525f..8a1d5f4b 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -6,7 +6,7 @@ <string name="status_activated">Conectado à rede Tor</string> <string name="status_disabled">O Orbot está desativado</string> <string name="status_shutting_down">O TorService está desligando</string> - <string name="menu_settings">Configurações</string> + <string name="menu_settings">Definições</string> <string name="menu_log">Log</string> <string name="menu_start">Iniciar</string> <string name="menu_stop">Parar</string>

1 0

[orbot/master] Merge pull request #527 from guardianproject/fix_523_onionbackup
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit e815bc07864f8ee968dfec3a8ce89257b76d8d65 Merge: d3fba523 5465fffb Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Oct 12 09:04:09 2021 -0400 Merge pull request #527 from guardianproject/fix_523_onionbackup Fixes #523 Onion Site Backup Bugs .../ui/hiddenservices/HiddenServicesActivity.java | 4 +++- .../ui/hiddenservices/backup/BackupUtils.java | 28 +++++++++++----------- .../ui/hiddenservices/dialogs/HSActionsDialog.java | 3 ++- .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 2 +- .../providers/HSContentProvider.java | 4 +++- .../OnionServiceActionsDialogFragment.java | 5 +++- .../ui/v3onionservice/OnionServiceActivity.java | 3 ++- .../OnionServiceContentProvider.java | 5 ++-- .../OnionServiceDeleteDialogFragment.java | 2 +- 9 files changed, 33 insertions(+), 23 deletions(-)

1 0

[orbot/master] stop warning us about jcenter...we know already!
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2d1455ef7ad66d1ef69e9c873550bc515885eed0 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 26 09:03:52 2021 -0400 stop warning us about jcenter...we know already! --- commons-device.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/commons-device.gradle b/commons-device.gradle index 0fd02b1a..f182a18b 100644 --- a/commons-device.gradle +++ b/commons-device.gradle @@ -59,6 +59,7 @@ android { } repositories { + //noinspection JcenterRepositoryObsolete jcenter { content { includeGroup('com.jraska')

1 0

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

22 Dec '21

commit 0b1e7be203f30c5f3d99abfb018f34b99873d80a Merge: 2d1455ef d119de00 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 26 09:04:06 2021 -0400 Merge branch 'no_v2_onions' app-mini/src/main/res/values-ar/strings.xml | 13 +- app-mini/src/main/res/values-ay/strings.xml | 13 +- app-mini/src/main/res/values-az/strings.xml | 3 +- app-mini/src/main/res/values-be/strings.xml | 13 +- app-mini/src/main/res/values-bg/strings.xml | 6 +- app-mini/src/main/res/values-ca/strings.xml | 13 +- app-mini/src/main/res/values-cs-rCZ/strings.xml | 3 +- app-mini/src/main/res/values-cs/strings.xml | 3 +- app-mini/src/main/res/values-cy/strings.xml | 3 +- app-mini/src/main/res/values-da/strings.xml | 6 +- app-mini/src/main/res/values-de/strings.xml | 13 +- app-mini/src/main/res/values-el/strings.xml | 13 +- app-mini/src/main/res/values-eo/strings.xml | 3 +- app-mini/src/main/res/values-es/strings.xml | 13 +- app-mini/src/main/res/values-et/strings.xml | 3 +- app-mini/src/main/res/values-eu/strings.xml | 13 +- app-mini/src/main/res/values-fa/strings.xml | 13 +- app-mini/src/main/res/values-fi/strings.xml | 6 +- app-mini/src/main/res/values-fr-rFR/strings.xml | 3 +- app-mini/src/main/res/values-fr/strings.xml | 13 +- app-mini/src/main/res/values-gl/strings.xml | 13 +- app-mini/src/main/res/values-hi/strings.xml | 13 +- app-mini/src/main/res/values-hr/strings.xml | 3 +- app-mini/src/main/res/values-hu/strings.xml | 13 +- app-mini/src/main/res/values-in/strings.xml | 3 +- app-mini/src/main/res/values-is/strings.xml | 13 +- app-mini/src/main/res/values-it/strings.xml | 13 +- app-mini/src/main/res/values-iw/strings.xml | 3 +- app-mini/src/main/res/values-ja/strings.xml | 13 +- app-mini/src/main/res/values-ko/strings.xml | 3 +- app-mini/src/main/res/values-lv/strings.xml | 6 +- app-mini/src/main/res/values-mk/strings.xml | 13 +- app-mini/src/main/res/values-ms-rMY/strings.xml | 6 +- app-mini/src/main/res/values-ms/strings.xml | 3 +- app-mini/src/main/res/values-my/strings.xml | 3 +- app-mini/src/main/res/values-nb/strings.xml | 13 +- app-mini/src/main/res/values-nl/strings.xml | 13 +- app-mini/src/main/res/values-pl/strings.xml | 6 +- app-mini/src/main/res/values-pt-rBR/strings.xml | 8 +- app-mini/src/main/res/values-pt/strings.xml | 6 +- app-mini/src/main/res/values-ro/strings.xml | 6 +- app-mini/src/main/res/values-ru/strings.xml | 13 +- app-mini/src/main/res/values-si-rLK/strings.xml | 6 +- app-mini/src/main/res/values-sk/strings.xml | 3 +- app-mini/src/main/res/values-sr/strings.xml | 13 +- app-mini/src/main/res/values-sv/strings.xml | 13 +- app-mini/src/main/res/values-ta/strings.xml | 6 +- app-mini/src/main/res/values-th/strings.xml | 13 +- app-mini/src/main/res/values-tl/strings.xml | 3 +- app-mini/src/main/res/values-tr/strings.xml | 13 +- app-mini/src/main/res/values-uk/strings.xml | 13 +- app-mini/src/main/res/values-vi/strings.xml | 3 +- app-mini/src/main/res/values-zh-rCN/strings.xml | 3 +- app-mini/src/main/res/values-zh-rTW/strings.xml | 13 +- app-mini/src/main/res/values/strings.xml | 11 - app-tv/src/main/res/values-ar/strings.xml | 13 +- app-tv/src/main/res/values-ay/strings.xml | 13 +- app-tv/src/main/res/values-az/strings.xml | 3 +- app-tv/src/main/res/values-be/strings.xml | 13 +- app-tv/src/main/res/values-bg/strings.xml | 6 +- app-tv/src/main/res/values-ca/strings.xml | 13 +- app-tv/src/main/res/values-cs-rCZ/strings.xml | 3 +- app-tv/src/main/res/values-cs/strings.xml | 3 +- app-tv/src/main/res/values-cy/strings.xml | 3 +- app-tv/src/main/res/values-da/strings.xml | 6 +- app-tv/src/main/res/values-de/strings.xml | 13 +- app-tv/src/main/res/values-el/strings.xml | 13 +- app-tv/src/main/res/values-eo/strings.xml | 3 +- app-tv/src/main/res/values-es/strings.xml | 13 +- app-tv/src/main/res/values-et/strings.xml | 3 +- app-tv/src/main/res/values-eu/strings.xml | 13 +- app-tv/src/main/res/values-fa/strings.xml | 13 +- app-tv/src/main/res/values-fi/strings.xml | 6 +- app-tv/src/main/res/values-fr-rFR/strings.xml | 3 +- app-tv/src/main/res/values-fr/strings.xml | 13 +- app-tv/src/main/res/values-gl/strings.xml | 13 +- app-tv/src/main/res/values-hi/strings.xml | 13 +- app-tv/src/main/res/values-hr/strings.xml | 3 +- app-tv/src/main/res/values-hu/strings.xml | 13 +- app-tv/src/main/res/values-in/strings.xml | 3 +- app-tv/src/main/res/values-is/strings.xml | 13 +- app-tv/src/main/res/values-it/strings.xml | 13 +- app-tv/src/main/res/values-iw/strings.xml | 3 +- app-tv/src/main/res/values-ja/strings.xml | 13 +- app-tv/src/main/res/values-ko/strings.xml | 3 +- app-tv/src/main/res/values-lv/strings.xml | 6 +- app-tv/src/main/res/values-mk/strings.xml | 13 +- app-tv/src/main/res/values-ms-rMY/strings.xml | 6 +- app-tv/src/main/res/values-ms/strings.xml | 3 +- app-tv/src/main/res/values-my/strings.xml | 3 +- app-tv/src/main/res/values-nb/strings.xml | 13 +- app-tv/src/main/res/values-nl/strings.xml | 13 +- app-tv/src/main/res/values-pl/strings.xml | 6 +- app-tv/src/main/res/values-pt-rBR/strings.xml | 8 +- app-tv/src/main/res/values-pt/strings.xml | 6 +- app-tv/src/main/res/values-ro/strings.xml | 6 +- app-tv/src/main/res/values-ru/strings.xml | 13 +- app-tv/src/main/res/values-si-rLK/strings.xml | 6 +- app-tv/src/main/res/values-sk/strings.xml | 3 +- app-tv/src/main/res/values-sr/strings.xml | 13 +- app-tv/src/main/res/values-sv/strings.xml | 13 +- app-tv/src/main/res/values-ta/strings.xml | 6 +- app-tv/src/main/res/values-th/strings.xml | 13 +- app-tv/src/main/res/values-tl/strings.xml | 3 +- app-tv/src/main/res/values-tr/strings.xml | 13 +- app-tv/src/main/res/values-uk/strings.xml | 13 +- app-tv/src/main/res/values-vi/strings.xml | 3 +- app-tv/src/main/res/values-zh-rCN/strings.xml | 3 +- app-tv/src/main/res/values-zh-rTW/strings.xml | 13 +- app-tv/src/main/res/values/strings.xml | 11 - app/src/main/AndroidManifest.xml | 28 -- .../main/java/org/torproject/android/OrbotApp.java | 3 + .../org/torproject/android/OrbotMainActivity.java | 179 +--------- .../ui/hiddenservices/ClientCookiesActivity.java | 175 ---------- .../ui/hiddenservices/HiddenServicesActivity.java | 194 ----------- .../adapters/ClientCookiesAdapter.java | 52 --- .../hiddenservices/adapters/OnionListAdapter.java | 59 ---- .../ui/hiddenservices/backup/BackupUtils.java | 388 --------------------- .../ui/hiddenservices/database/HSDatabase.java | 50 --- .../ui/hiddenservices/dialogs/AddCookieDialog.java | 95 ----- .../dialogs/CookieActionsDialog.java | 119 ------- .../hiddenservices/dialogs/CookieDeleteDialog.java | 37 -- .../ui/hiddenservices/dialogs/HSActionsDialog.java | 117 ------- .../ui/hiddenservices/dialogs/HSCookieDialog.java | 57 --- .../ui/hiddenservices/dialogs/HSDataDialog.java | 106 ------ .../ui/hiddenservices/dialogs/HSDeleteDialog.java | 46 --- .../providers/CookieContentProvider.java | 133 ------- .../providers/HSContentProvider.java | 143 -------- .../android/ui/onboarding/OnboardingActivity.java | 2 +- .../OnionServiceActionsDialogFragment.java | 5 +- .../ui/v3onionservice/OnionServiceActivity.java | 7 +- .../PermissionManager.java | 2 +- .../android/ui/v3onionservice/V3BackupUtils.java | 188 ++++++++++ .../backup => v3onionservice}/ZipUtilities.java | 3 +- .../clientauth/ClientAuthActivity.java | 6 +- .../clientauth/ClientAuthBackupDialogFragment.java | 6 +- .../res/layout/layout_activity_client_cookies.xml | 36 -- .../res/layout/layout_add_client_cookie_dialog.xml | 33 -- .../res/layout/layout_content_client_cookies.xml | 20 -- app/src/main/res/menu/cookie_menu.xml | 10 - app/src/main/res/menu/orbot_main.xml | 15 - app/src/main/res/values-ar/strings.xml | 11 - app/src/main/res/values-ay/strings.xml | 13 +- app/src/main/res/values-az/strings.xml | 3 +- app/src/main/res/values-be/strings.xml | 13 +- app/src/main/res/values-bg/strings.xml | 6 +- app/src/main/res/values-ca/strings.xml | 11 - app/src/main/res/values-cs-rCZ/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 3 +- app/src/main/res/values-cy/strings.xml | 3 +- app/src/main/res/values-da/strings.xml | 6 +- app/src/main/res/values-de/strings.xml | 12 - app/src/main/res/values-el/strings.xml | 11 - app/src/main/res/values-eo/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 11 - app/src/main/res/values-et/strings.xml | 3 +- app/src/main/res/values-eu/strings.xml | 11 - app/src/main/res/values-fa/strings.xml | 11 - app/src/main/res/values-fi/strings.xml | 5 - app/src/main/res/values-fr-rFR/strings.xml | 12 - app/src/main/res/values-fr/strings.xml | 13 +- app/src/main/res/values-gl/strings.xml | 11 - app/src/main/res/values-hi/strings.xml | 11 - app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 11 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-is/strings.xml | 12 - app/src/main/res/values-it/strings.xml | 11 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 11 - app/src/main/res/values-ko/strings.xml | 3 +- app/src/main/res/values-lt-rLT/strings.xml | 12 - app/src/main/res/values-lv/strings.xml | 6 +- app/src/main/res/values-mk/strings.xml | 11 - app/src/main/res/values-ms-rMY/strings.xml | 2 - app/src/main/res/values-ms/strings.xml | 3 +- app/src/main/res/values-my/strings.xml | 3 +- app/src/main/res/values-nb/strings.xml | 11 - app/src/main/res/values-nl/strings.xml | 11 - app/src/main/res/values-pl/strings.xml | 11 - app/src/main/res/values-pt-rBR/strings.xml | 12 - app/src/main/res/values-pt-rPT/strings.xml | 12 - app/src/main/res/values-pt/strings.xml | 12 - app/src/main/res/values-ro-rRO/strings.xml | 12 - app/src/main/res/values-ro/strings.xml | 6 +- app/src/main/res/values-ru/strings.xml | 12 - app/src/main/res/values-si-rLK/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 3 +- app/src/main/res/values-sr/strings.xml | 13 +- app/src/main/res/values-sv/strings.xml | 11 - app/src/main/res/values-ta/strings.xml | 6 +- app/src/main/res/values-th/strings.xml | 11 - app/src/main/res/values-tl/strings.xml | 3 +- app/src/main/res/values-tr/strings.xml | 12 - app/src/main/res/values-uk/strings.xml | 12 - app/src/main/res/values-vi/strings.xml | 12 - app/src/main/res/values-zh-rCN/strings.xml | 12 - app/src/main/res/values-zh-rTW/strings.xml | 13 +- app/src/main/res/values/strings.xml | 12 - .../torproject/android/service/OrbotService.java | 175 +--------- orbotservice/src/main/res/values-ar/strings.xml | 3 +- orbotservice/src/main/res/values-az/strings.xml | 3 +- orbotservice/src/main/res/values-bg/strings.xml | 3 +- orbotservice/src/main/res/values-ca/strings.xml | 3 +- .../src/main/res/values-cs-rCZ/strings.xml | 3 +- orbotservice/src/main/res/values-da/strings.xml | 3 +- orbotservice/src/main/res/values-de/strings.xml | 3 +- orbotservice/src/main/res/values-el/strings.xml | 3 +- orbotservice/src/main/res/values-eo/strings.xml | 3 +- orbotservice/src/main/res/values-es/strings.xml | 3 +- orbotservice/src/main/res/values-et/strings.xml | 3 +- orbotservice/src/main/res/values-eu/strings.xml | 3 +- orbotservice/src/main/res/values-fa/strings.xml | 3 +- orbotservice/src/main/res/values-fi/strings.xml | 3 +- .../src/main/res/values-fr-rFR/strings.xml | 3 +- orbotservice/src/main/res/values-gl/strings.xml | 3 +- orbotservice/src/main/res/values-hr/strings.xml | 3 +- orbotservice/src/main/res/values-hu/strings.xml | 3 +- orbotservice/src/main/res/values-in/strings.xml | 3 +- orbotservice/src/main/res/values-is/strings.xml | 3 +- orbotservice/src/main/res/values-it/strings.xml | 3 +- orbotservice/src/main/res/values-iw/strings.xml | 3 +- orbotservice/src/main/res/values-ja/strings.xml | 3 +- orbotservice/src/main/res/values-ko/strings.xml | 3 +- orbotservice/src/main/res/values-lv/strings.xml | 3 +- orbotservice/src/main/res/values-mk/strings.xml | 3 +- .../src/main/res/values-ms-rMY/strings.xml | 3 +- orbotservice/src/main/res/values-ms/strings.xml | 3 +- orbotservice/src/main/res/values-nb/strings.xml | 3 +- orbotservice/src/main/res/values-nl/strings.xml | 3 +- orbotservice/src/main/res/values-pl/strings.xml | 3 +- .../src/main/res/values-pt-rBR/strings.xml | 3 +- orbotservice/src/main/res/values-pt/strings.xml | 3 +- orbotservice/src/main/res/values-ro/strings.xml | 3 +- orbotservice/src/main/res/values-ru/strings.xml | 3 +- .../src/main/res/values-si-rLK/strings.xml | 3 +- orbotservice/src/main/res/values-sr/strings.xml | 3 +- orbotservice/src/main/res/values-sv/strings.xml | 3 +- orbotservice/src/main/res/values-th/strings.xml | 3 +- orbotservice/src/main/res/values-tl/strings.xml | 3 +- orbotservice/src/main/res/values-tr/strings.xml | 3 +- orbotservice/src/main/res/values-uk/strings.xml | 3 +- orbotservice/src/main/res/values-vi/strings.xml | 3 +- .../src/main/res/values-zh-rCN/strings.xml | 3 +- orbotservice/src/main/res/values/strings.xml | 1 - 245 files changed, 420 insertions(+), 3634 deletions(-)

1 0

[orbot/master] Merge pull request #529 from syphyr/main
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 8c8315008b3a569039845ea7accbfc9130a5d931 Merge: 2ee2955e 2b83f0d9 Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Tue Oct 19 14:10:53 2021 -0400 Merge pull request #529 from syphyr/main Add geoip library to libs.versions.toml gradle/libs.versions.toml | 4 +++- orbotservice/build.gradle | 1 + 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

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

22 Dec '21

commit ece15f2f9e249ec4ebe9963491ba96990c9043df Merge: 0b1e7be2 8c831500 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 26 09:04:17 2021 -0400 Merge branch 'master' of github.com:guardianproject/orbot app/src/main/res/values-pt-rBR/strings.xml | 2 +- gradle/libs.versions.toml | 2 ++ orbotservice/build.gradle | 1 + 3 files changed, 4 insertions(+), 1 deletion(-)

1 0