- tor-commits - lists.torproject.org

[orbot/master] update changelog for 16.5.2 beta 1
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 4a8ee89f09de106a67ec25db844e8a39144d8ae7 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Oct 26 16:36:16 2021 -0400 update changelog for 16.5.2 beta 1 --- CHANGELOG | 194 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 194 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 965d3f97..e209b446 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,197 @@ +/** 16.5.2-BETA 1 26 Oct 2021 **/ + +57add48c (HEAD -> master, origin/master, origin/HEAD) move libs.versions.toml to dependencies.gradle makes it easier to work with in Android Studio +9497a5e3 (tag: 16.5.2-BETA-1-tor.0.4.6.7) switch to tor 0.4.6.7 +ece15f2f Merge branch 'master' of github.com:guardianproject/orbot +0b1e7be2 Merge branch 'no_v2_onions' +2d1455ef stop warning us about jcenter...we know already! +d119de00 (no_v2_onions) handle geoip failed loading and other potential NPE +a783bf60 update library and gradle +3ad3f1df update library versions +8c831500 Merge pull request #529 from syphyr/main +2ee2955e Merge pull request #534 from weblate/weblate-guardianproject-orbot +a23f02b2 Translated using Weblate (Portuguese (Brazil)) +cb98e7fe (origin/no_v2_onions) Removes V2 Onion Services From Orbot - Removes V2 Hosted Services and Client Cookies - Removes Assocaited Code in OrbotService - OrbotApp will delete local v2 databases - Removes XML Resources - Refactored V2 code that V3 used to appropriate V3 Backages +e815bc07 Merge pull request #527 from guardianproject/fix_523_onionbackup +2b83f0d9 Add geoip library to libs.versions.toml +5465fffb (origin/fix_523_onionbackup) Fixes #523 Onion Site Backup Bags +d3fba523 Merge branch 'fix_519_exit_icon' +3b81a4e0 (fix_519_exit_icon) Merge branch 'master' into fix_519_exit_icon +af5f9ef6 Merge branch 'sisbell-509' +87084b29 (sisbell-509) Merge branch '509' of https://github.com/sisbell/orbot into sisbell-509 +384518da Merge pull request #515 from weblate/weblate-guardianproject-orbot +2085efbb Translated using Weblate (Polish) +d991a573 Translated using Weblate (German) +b04d74d6 Translated using Weblate (Hebrew) +b52082df Translated using Weblate (Finnish) +f7e024ff Translated using Weblate (Ukrainian) +eaa9c306 Translated using Weblate (Lithuanian) +cc3c0cbd Translated using Weblate (Vietnamese) +1065d695 Translated using Weblate (Romanian) +52d30704 Translated using Weblate (Italian) +03152454 (origin/fix_519_exit_icon) Fixes 519 Icon Always Leaves on Exit +f2ea0b95 orbotservice lint; unused imports +e625d4c8 local.properties ignored twice +0a296e87 add tv screenshots to fastlane +6287db6d Merge branch 'bitmold-vpn_blocklist' +482696b9 (origin/bitmold-vpn_blocklist, bitmold-vpn_blocklist) only set disallowed if "per app" is not being used +a8565835 Merge branch 'vpn_blocklist' of https://github.com/bitmold/orbot into bitmold-vpn_blocklist +81d25780 ensure tor conn events are set properly by waiting one second longer (waiting for a better fix from TorService library on this) +2697c93c remove debug commandline for pdnsd (doesn't work) +e8a6e14f remove command line debug commands (don't work, cause failed pdnsd startup) +9759e94f Fixes #474 Remove Briar from Orbot VPN Routing + UI +8ed64e61 Remove typo +4727db2d Implements #509: Use Gradle Version Catalog +822d3582 Merge branch 'bitmold-missing_vpn_icons' +91f0fc4c (bitmold-missing_vpn_icons) Merge branch 'missing_vpn_icons' of https://github.com/bitmold/orbot into bitmold-missing_vpn_icons +9376a33f Merge branch 'sisbell-505' +3943b9d9 (sisbell-505) Merge branch '505' of https://github.com/sisbell/orbot into sisbell-505 +f3a83d6e remove unsupported string locale +aa2f224b Merge branch 'sisbell-501' +c4c099ad (sisbell-501) Merge branch '501' of https://github.com/sisbell/orbot into sisbell-501 +9376d450 Merge pull request #497 from weblate/weblate-guardianproject-orbot +c1fdff65 Package name is saved for torified apps instead of "username". This is much more performant than the last commit, but the UI will not immediately be updated if the user had older Orbot data saved (No "torification" is actually compromised though...) +d8a44643 Fixes #498, Not performant because pref data isn't migrated +e6c9d985 Translated using Weblate (Russian) +31458190 Translated using Weblate (Ukrainian) +0748373b Translated using Weblate (Chinese (Simplified)) +517661ce Translated using Weblate (Turkish) +e0d819fb Translated using Weblate (Portuguese (Brazil)) +5909ae70 Translated using Weblate (Icelandic) +44f59e03 Translated using Weblate (Hebrew) +b9b4706c Translated using Weblate (Bengali) +80af9baa Translated using Weblate (Russian) +2b3794b1 Translated using Weblate (Dutch) +088a0f47 Translated using Weblate (Romanian) +83a855b8 Translated using Weblate (Polish) +fd12e20d Translated using Weblate (Lithuanian) +c43662a9 Translated using Weblate (Turkish) +ff8411ab Add in versionCode updates based on ABI +c75f5305 Removed Log.e from OrbotService onBind (not an error) +c3f2395d Format error in pdnsd configuration, expected number given "off" +4569eec6 CDN Fronts Reader never closed +75a5748f SELECT -> Select +5f45f0ac App should also include a universal APK for build +ef8a8f1d Fixes #505: Custom bridges Send to Email feature does not include Subject or Body message for some devices +92693d66 abi codes no longer used. +91778035 Use def rather than ext for defining getVersionName. This avoids a conflict with internal gradle API. +11a59387 Remove unused build code for version overrides +0669e248 Turn back on lint check for orbotservice +193f0fc6 Fix #501 - Duplicate Config Info in Build Files +3ad5324d remove old obfs4proxy binary (now using IPtProxy) +2e723388 update android dependencies +9bb2e3f7 (tag: orbot-tv-1.0.0-BETA-2-tor-0.4.5.9) update orbot-tv aka app-tv release to 10020000 +7023cd27 enable snowflake mode for orbotTV +055900d9 add UI feedback when Snowflake Proxy mode is enabled +5b33510d Merge branch 'master' of github.com:guardianproject/orbot +283b281c Merge pull request #493 from weblate/weblate-guardianproject-orbot +bca48cc9 Merge branch 'master' of github.com:guardianproject/orbot +df0cfc80 Merge pull request #495 from SkewedZeppelin/fixup +443f383a Translated using Weblate (Sinhala) +dbaf06be Fixup 93bf7b24 +cb9bd46e Merge pull request #491 from SkewedZeppelin/nodebugpdnsd +9717385a Merge pull request #490 from syphyr/main +93bf7b24 Only enable pdnsd debug output when debug logging is enabled +7e223f02 (tag: 16.5.1-BETA-2a-tor.0.4.5.9) update version 1651100210 (quick pdnsd fix) +ecd12b0b update build info on renaming pdnsd after ndk-build +6afd54bf have to build pdnsd as an executable, then rename it to libpdnsd.so +7c6f924f Create only one pdnsd config file +2a0ffa65 (tag: 16.5.1-BETA-2-tor.0.4.5.9, syphyr-main) update to version 1651100200 +1113f18c enable focus highlighting for non touch screens +fdb16f27 fix orbot-tv app highlighting +9a03f120 Merge branch 'master' of github.com:guardianproject/orbot into syphyr-main +a749fe0d Merge pull request #486 from weblate/weblate-guardianproject-orbot +8472e0dd Merge pull request #483 from SkewedZeppelin/avoiddiskwrites +e75f0c76 Merge pull request #487 from cohosh/default-bridge +570f7133 Translated using Weblate (Italian) +cab9ea3f Translated using Weblate (Turkish) +9d58ca88 Translated using Weblate (Vietnamese) +184068d1 Translated using Weblate (Chinese (Simplified)) +26622efe Translated using Weblate (Ukrainian) +ed259377 Translated using Weblate (Romanian) +21f6597b Translated using Weblate (Portuguese (Brazil)) +e08cfa44 Translated using Weblate (Hebrew) +5943f0c1 Translated using Weblate (French) +e56ce667 Remove old default bridge +602d2115 Merge branch 'main' of https://github.com/syphyr/orbot into syphyr-main +78f0b765 update gradle tools +920a4e30 Merge pull request #481 from SkewedZeppelin/snowflakelimit +d55ebce9 Merge branch 'SkewedZeppelin-snowflakelimit' +877556a9 (SkewedZeppelin-snowflakelimit) fix conflict +ef0e1c24 Merge branch 'master' of github.com:guardianproject/orbot +ddb95c33 Merge pull request #482 from SkewedZeppelin/snowflakelimitdefault +7d526c2e Merge pull request #476 from SkewedZeppelin/isolatehttp +65168659 Merge branch 'master' of github.com:guardianproject/orbot +2f62f17f Merge pull request #485 from weblate/weblate-guardianproject-orbot +206e7ee2 (tag: 16.5.1-BETA-1-tor.0.4.5.9) update to 1651100100 +9226ccbe Translated using Weblate (Finnish) +806b7233 improve stop/start logic for tor and snowflake +c0b09bff don't destroy service each time you stop Tor - causes memory issues and crashes in libtor +f2199c59 Actually enable AvoidDiskWrites +e07c3129 Build pdnsd as shared library +3498903f Limit snowflake by default +fe38aa2d Fixup snowflake limit check +f313d83f only provide 1 snowlake proxy connection at a time +a398b446 enable limit snowflake proxy mode to plugged in and unmetered connections +7e3b3e5b update grade and tor-android to 0.4.5.9 +245eb345 Enable IsolateDestAddr on HTTPTunnelPort if set +0636eacb Merge branch 'weblate-weblate-guardianproject-orbot' +fac3b206 (weblate-weblate-guardianproject-orbot) must use youtube for video links for play store +cadeee4b Merge branch 'weblate-guardianproject-orbot' of https://github.com/weblate/orbot into weblate-weblate-guardianproject-orbot +589df2a9 Merge branch 'master' of github.com:guardianproject/orbot +ed5833e1 latest changelog additions +65d8ca30 small changes for showing snowflake activation +b3116b7c dns config file formatting fix +718fca6b cleanup of VPN DNS startup +ace8a88e Merge pull request #466 from syphyr/main +7c7a265c Merge pull request #470 from RyHmann/patch-1 +df4d4201 Cleanup old references to Polipo +abce51c9 Update README.md +c3ff9b75 Translated using Weblate (German) +31f538e5 Translated using Weblate (German) +09e47093 Translated using Weblate (Chinese (Simplified)) +d1c48c4f Translated using Weblate (Hebrew) +098c9122 Translated using Weblate (French) +c4b27c27 Translated using Weblate (Turkish) +972972a5 Translated using Weblate (Indonesian) +a3e98abe Translated using Weblate (Ukrainian) +fd5f775c Translated using Weblate (Portuguese (Brazil)) +ff18db92 Translated using Weblate (Ukrainian) +73bcfb53 Merge branch 'master' of github.com:guardianproject/orbot +ed96c1a2 Merge pull request #465 from cohosh/single-snowflake +be382ada Use only a single Snowflake at a time +5e3963d8 (tag: 16.5.0-ALPHA-2-tor.0.4.5.7) update Orbot to 1650200100 +71545226 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) + /** 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

1 0

[orbot/master] Fix missing dependencies for app-tv
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 4c27f85fd8be74befdee157a431e4a2cecc49caf Author: syphyr <syphyr(a)gmail.com> Date: Wed Oct 27 03:24:33 2021 +0200 Fix missing dependencies for app-tv Execution failed for task ':app-tv:processTeeveeReleaseResources'. > A failure occurred while executing com.android.build.gradle.internal.res.LinkApplicationAndroidResourcesTask$TaskAction > Android resource linking failed ERROR:/src/orbot/app-tv/build/intermediates/packaged_manifests/teeveeRelease/ x86_64/AndroidManifest.xml:45: AAPT: error: resource style/Theme.Leanback (aka org.torproject.android.tv:style/Theme.Leanback) not found. --- app-tv/build.gradle | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app-tv/build.gradle b/app-tv/build.gradle index 10017f54..f4978231 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -39,7 +39,19 @@ dependencies { implementation( project(':appcore'), project(':intentintegrator'), - project(':orbotservice') + project(':orbotservice'), + libs.android_material, + libs.android_snowfall, + libs.androidx_coordinator, + libs.androidx_leanback_core, + libs.androidx_leanback_paging, + libs.androidx_leanback_preferences, + libs.androidx_leanback_tab, + libs.androidx_localbroadcast, + libs.androidx_palette, + libs.androidx_recyclerview, + libs.apl_appintro, + libs.guardian_jtorctl ) androidTestImplementation libs.fastlane_screengrab -} \ No newline at end of file +}

1 0

[orbot/master] Correct typo in orbot error message
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit ab1c39a74cbbd1f868990b3a1cf887eaef45b340 Author: syphyr <syphyr(a)gmail.com> Date: Wed Oct 27 19:25:37 2021 +0200 Correct typo in orbot error message --- .../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 00ae9fb9..280d26e3 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -487,7 +487,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } catch (Exception e) { //what error here - Log.e(OrbotConstants.TAG, "Error installing setting up Orbot", e); + Log.e(OrbotConstants.TAG, "Error setting up Orbot", e); logNotice("There was an error setting up Orbot"); }

1 0

[orbot/master] Cleanup dependency implementations and list
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c5dca23de66a93a8ca7809174191e1778b2efe38 Author: syphyr <syphyr(a)gmail.com> Date: Tue Nov 2 00:43:15 2021 +0100 Cleanup dependency implementations and list Fixes: "Implements #509: Use Gradle Version Catalog" Use same library implentations as before Gradle Version Catalog was introduced. Some extra implentations were added when Gradle Version Catalog was introduced and are not needed to build the project. Also fix spacing in dependency list. --- app-mini/build.gradle | 5 ++--- app-tv/build.gradle | 5 ++--- app/build.gradle | 9 +++----- dependencies.gradle | 58 +++++++++++++++++++++++++-------------------------- 4 files changed, 36 insertions(+), 41 deletions(-) diff --git a/app-mini/build.gradle b/app-mini/build.gradle index 8b961574..89227cee 100644 --- a/app-mini/build.gradle +++ b/app-mini/build.gradle @@ -35,12 +35,11 @@ android { project(path: ':intentintegrator'), project(':orbotservice'), libs.android_material, + libs.androidx_constraint, libs.androidx_coordinator, - libs.androidx_localbroadcast, libs.androidx_palette, libs.androidx_recyclerview, - libs.apl_appintro, - libs.guardian_jtorctl + libs.apl_appintro ) androidTestImplementation libs.fastlane_screengrab } diff --git a/app-tv/build.gradle b/app-tv/build.gradle index f4978231..e5f33882 100644 --- a/app-tv/build.gradle +++ b/app-tv/build.gradle @@ -42,16 +42,15 @@ dependencies { project(':orbotservice'), libs.android_material, libs.android_snowfall, + libs.androidx_constraint, libs.androidx_coordinator, libs.androidx_leanback_core, libs.androidx_leanback_paging, libs.androidx_leanback_preferences, libs.androidx_leanback_tab, - libs.androidx_localbroadcast, libs.androidx_palette, libs.androidx_recyclerview, - libs.apl_appintro, - libs.guardian_jtorctl + libs.apl_appintro ) androidTestImplementation libs.fastlane_screengrab } diff --git a/app/build.gradle b/app/build.gradle index 93304560..0f5a8b21 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -58,18 +58,15 @@ android { project(':appcore'), project(':intentintegrator'), project(':orbotservice'), - libs.apl_appintro, + libs.android_material, libs.android_snowfall, libs.android_volley, - libs.androidx_core, libs.androidx_localbroadcast, - libs.androidx_palette, - libs.android_material, + libs.apl_appintro, libs.bclogic_pulsator, - libs.guardian_jtorctl, libs.ipt_proxy ) androidTestImplementation libs.fastlane_screengrab } -} \ No newline at end of file +} diff --git a/dependencies.gradle b/dependencies.gradle index 74e5364d..555c4977 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -5,12 +5,12 @@ ext { android_snowfall : "1.2.1", android_volley : "1.2.0", androidx_appcompat : "1.3.1", - androidx_constraint : "2.1.0", - androidx_coordinator: "1.1.0", + androidx_constraint : "2.1.0", + androidx_coordinator : "1.1.0", androidx_core : "1.6.0", androidx_leanback : "1.2.0-alpha01", - androidx_leanback_paging : "1.1.0-alpha08", - androidx_leanback_tab : "1.1.0-beta01", + androidx_leanback_paging : "1.1.0-alpha08", + androidx_leanback_tab : "1.1.0-beta01", androidx_localbroadcast : "1.0.0", androidx_palette : "1.0.0", androidx_recyclerview : "1.2.1", @@ -26,29 +26,29 @@ ext { ] libs = [ - android_material : "com.google.android.material:material:$versions.android_material", - android_shell : "com.jaredrummler:android-shell:$versions.android_shell" , - android_snowfall : "com.github.jetradarmobile:android-snowfall:$versions.android_snowfall" , - android_volley : "com.android.volley:volley:$versions.android_volley" , - androidx_appcompat : "androidx.appcompat:appcompat:$versions.androidx_appcompat" , - androidx_constraint : "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint" , - androidx_coordinator : "androidx.coordinatorlayout:coordinatorlayout:$versions.androidx_coordinator" , - androidx_core : "androidx.core:core:$versions.androidx_core" , - androidx_leanback_core : "androidx.leanback:leanback:$versions.androidx_leanback" , - androidx_leanback_paging : "androidx.leanback:leanback-paging:$versions.androidx_leanback_paging" , - androidx_leanback_preferences: "androidx.leanback:leanback-preference:$versions.androidx_leanback" , - androidx_leanback_tab : "androidx.leanback:leanback-tab:$versions.androidx_leanback_tab" , - androidx_localbroadcast : "androidx.localbroadcastmanager:localbroadcastmanager:$versions.androidx_localbroadcast" , - androidx_palette : "androidx.palette:palette:$versions.androidx_palette" , - androidx_recyclerview : "androidx.recyclerview:recyclerview:$versions.androidx_recyclerview" , - apl_appintro : "com.github.apl-devs:appintro:$versions.apl_appintro" , - bclogic_pulsator : "pl.bclogic:pulsator4droid:$versions.bclogic_pulsator" , - fastlane_screengrab : "tools.fastlane:screengrab:$versions.fastlane_screengrab" , - guardian_geoip : "info.guardianproject:geoip:$versions.guardian_geoip" , - guardian_jsocks : "com.gitlab.guardianproject:jsocksandroid:$versions.guardian_jsocks" , - guardian_jtorctl : "info.guardianproject:jtorctl:$versions.guardian_jtorctl" , - ipt_proxy : "com.github.tladesignz:IPtProxy:$versions.ipt_proxy" , - portmapper : "com.offbynull.portmapper:portmapper:$versions.portmapper" , - tor_android : "info.guardianproject:tor-android:$versions.tor_android" + android_material : "com.google.android.material:material:$versions.android_material", + android_shell : "com.jaredrummler:android-shell:$versions.android_shell", + android_snowfall : "com.github.jetradarmobile:android-snowfall:$versions.android_snowfall", + android_volley : "com.android.volley:volley:$versions.android_volley", + androidx_appcompat : "androidx.appcompat:appcompat:$versions.androidx_appcompat", + androidx_constraint : "androidx.constraintlayout:constraintlayout:$versions.androidx_constraint", + androidx_coordinator : "androidx.coordinatorlayout:coordinatorlayout:$versions.androidx_coordinator", + androidx_core : "androidx.core:core:$versions.androidx_core", + androidx_leanback_core : "androidx.leanback:leanback:$versions.androidx_leanback", + androidx_leanback_paging : "androidx.leanback:leanback-paging:$versions.androidx_leanback_paging", + androidx_leanback_preferences : "androidx.leanback:leanback-preference:$versions.androidx_leanback", + androidx_leanback_tab : "androidx.leanback:leanback-tab:$versions.androidx_leanback_tab", + androidx_localbroadcast : "androidx.localbroadcastmanager:localbroadcastmanager:$versions.androidx_localbroadcast", + androidx_palette : "androidx.palette:palette:$versions.androidx_palette", + androidx_recyclerview : "androidx.recyclerview:recyclerview:$versions.androidx_recyclerview", + apl_appintro : "com.github.apl-devs:appintro:$versions.apl_appintro", + bclogic_pulsator : "pl.bclogic:pulsator4droid:$versions.bclogic_pulsator", + fastlane_screengrab : "tools.fastlane:screengrab:$versions.fastlane_screengrab", + guardian_geoip : "info.guardianproject:geoip:$versions.guardian_geoip", + guardian_jsocks : "com.gitlab.guardianproject:jsocksandroid:$versions.guardian_jsocks", + guardian_jtorctl : "info.guardianproject:jtorctl:$versions.guardian_jtorctl", + ipt_proxy : "com.github.tladesignz:IPtProxy:$versions.ipt_proxy", + portmapper : "com.offbynull.portmapper:portmapper:$versions.portmapper", + tor_android : "info.guardianproject:tor-android:$versions.tor_android" ] -} \ No newline at end of file +}

1 0

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

22 Dec '21

commit 266ef25416b158a848ef646e0dd7b9d53b80feaa Merge: 4a8ee89f c5dca23d Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Wed Nov 3 10:49:14 2021 -0400 Merge pull request #535 from syphyr/main Fix typo in dependencies.gradle app-mini/build.gradle | 5 +- app-tv/build.gradle | 15 +++++- app/build.gradle | 9 ++-- dependencies.gradle | 58 +++++++++++----------- .../torproject/android/service/OrbotService.java | 2 +- 5 files changed, 48 insertions(+), 41 deletions(-)

1 0

[orbot/master] Fix typo in dependencies.gradle
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 0393a8f5982623554d4228f226fe6c9956610a6f Author: syphyr <syphyr(a)gmail.com> Date: Wed Oct 27 02:43:05 2021 +0200 Fix typo in dependencies.gradle Fixes: move libs.versions.toml to dependencies.gradle makes it easier to work with in Android Studio --- dependencies.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies.gradle b/dependencies.gradle index e8621f40..74e5364d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -40,7 +40,7 @@ ext { androidx_leanback_tab : "androidx.leanback:leanback-tab:$versions.androidx_leanback_tab" , androidx_localbroadcast : "androidx.localbroadcastmanager:localbroadcastmanager:$versions.androidx_localbroadcast" , androidx_palette : "androidx.palette:palette:$versions.androidx_palette" , - androidx_recyclerview : "androidx.recyclerview:recyclerview$versions.androidx_recyclerview" , + androidx_recyclerview : "androidx.recyclerview:recyclerview:$versions.androidx_recyclerview" , apl_appintro : "com.github.apl-devs:appintro:$versions.apl_appintro" , bclogic_pulsator : "pl.bclogic:pulsator4droid:$versions.bclogic_pulsator" , fastlane_screengrab : "tools.fastlane:screengrab:$versions.fastlane_screengrab" ,

1 0

[orbot/master] Closes #537 updated some copy too...
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 9c23f79d141e2e472e44d1c3f347c48d6bc55db0 Author: bim <dsnake(a)protonmail.com> Date: Sat Nov 6 12:47:41 2021 -0400 Closes #537 updated some copy too... --- LICENSE | 4 ++-- app/src/main/res/values/strings.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/LICENSE b/LICENSE index 194b99d9..03ad8a80 100644 --- a/LICENSE +++ b/LICENSE @@ -1,10 +1,10 @@ This file contains the license for Orbot, a free software project to -provide anonymity on the Internet from a Google Android smartphone. +provide anonymity on the Internet from a Google Android device. It also lists the licenses for other components used by Orbot, including Tor, and iptables. -For more information about Orbot, see https://guardianproject.info/apps/org.torproject.android/ +For more information about Orbot, see https://orbot.app/ If you got this file as a part of a larger bundle, there may be other license terms that you should be aware of. diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7936af5b..a6dbbe00 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ <string name="menu_share_bridge">Share BridgeQR</string>  <string name="wizard_details">Some Orbot Details</string> - <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN, Tun2Socks and LibEvent. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network. Orbot also has the ability, on rooted device, to send all internet traffic through Tor.</string> + <string name="wizard_details_msg">Orbot is an open-source application that contains Tor, Obfs4Proxy, BadVPN, Tun2Socks and LibEvent. It provides a local HTTP proxy (8118) and a SOCKS proxy (9050) into the Tor network.</string>  <string name="pref_general_group">General</string> <string name="pref_start_boot_title">Start Orbot on Boot</string> @@ -90,8 +90,8 @@ <string name="ports_reachable_behind_a_restrictive_firewall">Ports reachable behind a restrictive firewall</string> <string name="enter_ports">Enter ports</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Enable debug log to output (must use adb or aLogcat to view)</string> - <string name="project_home">Project Home(s): </string> - <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> + <string name="project_home">Project Home:</string> + <string name="project_urls">https://orbot.app/</string> <string name="third_party_software">3rd-Party-Software: </string> <string name="tor_version">Tor: https://www.torproject.org</string> <string name="libevent_version">LibEvent: http://www.monkey.org/~provos/libevent/</string>

1 0

[orbot/master] update gitlab CI for Android 30 Java 11
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit 2a114a6a07be442b7e34fe8e91a41112413bc241 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 8 09:44:21 2021 -0500 update gitlab CI for Android 30 Java 11 --- .gitlab-ci.yml | 37 +++++++++++++++++++------------------ app/build.gradle | 2 +- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3095a87..5e12e5f5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,25 +1,26 @@ -image: openjdk:8-jdk +image: openjdk:11-jdk variables: - ANDROID_COMPILE_SDK: "28" - ANDROID_BUILD_TOOLS: "28.0.2" - ANDROID_SDK_TOOLS: "4333796" +ANDROID_COMPILE_SDK: "30" +ANDROID_BUILD_TOOLS: "30.0.3" +ANDROID_SDK_TOOLS: "6858069_latest" + before_script: - - apt-get --quiet update --yes - - apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 - - wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/sdk-tools-linux-${ANDROID_SDK_TOOL… - - unzip -qq -d android-sdk-linux android-sdk.zip - - echo y | android-sdk-linux/tools/bin/sdkmanager "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "platform-tools" >/dev/null - - echo y | android-sdk-linux/tools/bin/sdkmanager "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null - - export ANDROID_HOME=$PWD/android-sdk-linux - - export PATH=$PATH:$PWD/android-sdk-linux/platform-tools/ - - chmod +x ./gradlew - # temporarily disable checking for EPIPE error and use yes to accept all licenses - - set +o pipefail - - yes | android-sdk-linux/tools/bin/sdkmanager --licenses - - set -o pipefail +- apt-get --quiet update --yes +- apt-get --quiet install --yes wget tar unzip lib32stdc++6 lib32z1 +- wget --quiet --output-document=android-sdk.zip https://dl.google.com/android/repository/commandlinetools-linux-${ANDROID_S… +- unzip -d android-sdk-linux android-sdk.zip +- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. "platforms;android-${ANDROID_COMPILE_SDK}" >/dev/null +- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. "platform-tools" >/dev/null +- echo y | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. "build-tools;${ANDROID_BUILD_TOOLS}" >/dev/null +- export ANDROID_SDK_ROOT=$PWD +- export PATH=$PATH:$PWD/platform-tools/ +- chmod +x ./gradlew +# temporarily disable checking for EPIPE error and use yes to accept all licenses +- set +o pipefail +- yes | android-sdk-linux/cmdline-tools/bin/sdkmanager --sdk_root=. --licenses +- set -o pipefail stages: - build diff --git a/app/build.gradle b/app/build.gradle index 93304560..97549791 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -72,4 +72,4 @@ android { ) androidTestImplementation libs.fastlane_screengrab } -} \ No newline at end of file +}

1 0

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

22 Dec '21

commit 515d0e52c6c8d9dedb58bb4dab84b12179b45b93 Merge: 2a114a6a aa48f6b6 Author: n8fr8 <nathan(a)guardianproject.info> Date: Mon Nov 8 09:44:39 2021 -0500 Merge branch 'master' of github.com:guardianproject/orbot LICENSE | 4 +- app-mini/build.gradle | 5 +- app-tv/build.gradle | 15 ++++- app/build.gradle | 7 +-- app/src/main/res/layout/layout_about.xml | 67 ++++++++-------------- app/src/main/res/values-ar/strings.xml | 1 - app/src/main/res/values-ay/strings.xml | 3 +- app/src/main/res/values-az/strings.xml | 1 - app/src/main/res/values-be/strings.xml | 3 +- app/src/main/res/values-bg/strings.xml | 1 - app/src/main/res/values-bn-rBD/strings.xml | 1 - app/src/main/res/values-bn/strings.xml | 1 - app/src/main/res/values-ca/strings.xml | 1 - app/src/main/res/values-cs-rCZ/strings.xml | 1 - app/src/main/res/values-cs/strings.xml | 1 - app/src/main/res/values-cy/strings.xml | 1 - app/src/main/res/values-da/strings.xml | 1 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-el/strings.xml | 1 - app/src/main/res/values-en-rGB/strings.xml | 1 - app/src/main/res/values-eo/strings.xml | 1 - app/src/main/res/values-es-rAR/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 1 - app/src/main/res/values-et/strings.xml | 1 - app/src/main/res/values-eu/strings.xml | 1 - app/src/main/res/values-fa/strings.xml | 1 - app/src/main/res/values-fi/strings.xml | 1 - app/src/main/res/values-fr-rFR/strings.xml | 1 - app/src/main/res/values-fr/strings.xml | 3 +- app/src/main/res/values-gl/strings.xml | 1 - app/src/main/res/values-hi/strings.xml | 1 - app/src/main/res/values-hr/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 1 - app/src/main/res/values-in/strings.xml | 1 - app/src/main/res/values-is/strings.xml | 1 - app/src/main/res/values-it/strings.xml | 1 - app/src/main/res/values-iw/strings.xml | 1 - app/src/main/res/values-ja/strings.xml | 1 - app/src/main/res/values-ko/strings.xml | 1 - app/src/main/res/values-lt-rLT/strings.xml | 1 - app/src/main/res/values-lt/strings.xml | 3 +- app/src/main/res/values-lv/strings.xml | 1 - app/src/main/res/values-mk/strings.xml | 1 - app/src/main/res/values-ms-rMY/strings.xml | 1 - app/src/main/res/values-ms/strings.xml | 1 - app/src/main/res/values-nb/strings.xml | 1 - app/src/main/res/values-nl/strings.xml | 1 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-pt-rBR/strings.xml | 1 - app/src/main/res/values-pt-rPT/strings.xml | 1 - app/src/main/res/values-pt/strings.xml | 1 - app/src/main/res/values-ro-rRO/strings.xml | 1 - app/src/main/res/values-ro/strings.xml | 1 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-si-rLK/strings.xml | 1 - app/src/main/res/values-sk-rSK/strings.xml | 1 - app/src/main/res/values-sk/strings.xml | 1 - app/src/main/res/values-sl/strings.xml | 1 - app/src/main/res/values-sq/strings.xml | 1 - app/src/main/res/values-sr/strings.xml | 3 +- app/src/main/res/values-sv/strings.xml | 1 - app/src/main/res/values-ta/strings.xml | 1 - app/src/main/res/values-th/strings.xml | 1 - app/src/main/res/values-tl/strings.xml | 1 - app/src/main/res/values-tr/strings.xml | 1 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values-vi/strings.xml | 1 - app/src/main/res/values-zh-rCN/strings.xml | 1 - app/src/main/res/values-zh-rTW/strings.xml | 3 +- app/src/main/res/values/strings.xml | 9 +-- dependencies.gradle | 58 +++++++++---------- .../torproject/android/service/OrbotService.java | 2 +- 72 files changed, 86 insertions(+), 161 deletions(-)

1 0

[orbot/master] Update .gitlab-ci.yml file
by n8fr8＠torproject.org 22 Dec '21

22 Dec '21

commit c3b64f85a44676ee215fcb68ef47d03006b0d4db Author: Nathan Freitas <nathan(a)guardianproject.info> Date: Mon Nov 8 15:44:46 2021 +0000 Update .gitlab-ci.yml file --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e12e5f5..0e2fac61 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,9 +1,9 @@ image: openjdk:11-jdk variables: -ANDROID_COMPILE_SDK: "30" -ANDROID_BUILD_TOOLS: "30.0.3" -ANDROID_SDK_TOOLS: "6858069_latest" + ANDROID_COMPILE_SDK: "30" + ANDROID_BUILD_TOOLS: "30.0.3" + ANDROID_SDK_TOOLS: "6858069_latest" before_script:

1 0