tor-commits December 2020

tor-commits@lists.torproject.org

19 participants
1639 discussions

[orbot/master] update changelog for 16.3.2
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 82c56031e2c1eb8a3559be85539b81445b4336fe Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Nov 3 08:56:35 2020 -0500 update changelog for 16.3.2 --- CHANGELOG | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index e8a21554..7187f2cc 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,65 @@ +/** 16.3.2-RC-1-tor-0.4.3.6 / 2 November 2020 / c69a217aa8e1f09a34634da50e7af55c4fc73a21 **/ + +c69a217a (HEAD -> master, tag: 16.3.2-RC-1-tor-0.4.3.6) update to 16.3.2 +92185886 (origin/master, origin/HEAD) Merge branch 'master' of github.com:guardianproject/orbot +eb84e9fc Merge pull request #404 from bitmold/androidx-gradle-optimizations +a0e9460e Merge branch 'master' of github.com:guardianproject/orbot +2b394294 update build tools +07e77940 Merge pull request #402 from bitmold/newnym_ui_fixes +e2b01306 Use smaller androidx dependencies in orbotservice. specifically just use core for notifications, and another one for localbroadcastmanager +39a5ceb6 Removed another small & uneeded method from OrbotService related to notifications +e63b9e61 Fixes #401 Only NEWNYM Through UI When Sensible - The "NEW IDENTITY" button in the notification is only visible when the user can click on it - Clicking the refresh button in the main app gives you a new identity if you have one, does nothing if Tor is starting, and starts tor if it's off/stopping +804ce57a update app-mini builds tools to 29.0.3 +860908d1 (public/master, newport/master) update builds tools to 29.0.3 and gradle to 4.0.2 +1cbcd4f7 Merge pull request #396 from bitmold/leaky_async_tasks +3d4ddd95 specify NDK version for CI builds +baa7ec77 Merge branch 'master' of github.com:guardianproject/orbot +a66b99dd Merge branch 'bitmold-backup_fix' +8fca5f8e Create android.yml +929407d4 (bitmold-backup_fix) finishing touches (also use bundle keys in backup flows) +1439356d UI Validation on Dialogs: - UI is ready for v3 client cookies (just uncomment one line of code) - when text input is incorrect, the submit button will be disabled rather dismissing the dialog and showing the user a vague Toast + erasing all their input +cdb8581c Legacy Onion Service Backup/Restore and Cookie backup/restore works. +b0ec2fac Fixes #180 removes Spinner from HostedServices +62ff81c2 Used Storage Access Framework for cookie backup/restore and onion service backup/restore. +7a097561 removed Context memory leak from OrbotService (Tun2Socks) +4d5341e3 Used static inner classes for AsyncTasks in OrbotMainActivity, BridgeWizardActivity + AppManagerActivity. Removes huge warnings from code. Anonymous AsyncTask implementations (such as Handler) implicitly hold a reference to the outer Activity, this could cause a memory leak where the AsyncTask is still running after the Activity has terminated +462f7dac OrbotService does NOT need WRITE_EXTERNAL_STORAGE (this sets us up to fully remove the permission on APIs 19+ after #395 is merged +0a391f03 update LICENSE +cf2dd390 removed polipo from about +5dad571e set baselineAligned = false on main layout for better performance +e436df06 Final linting round: - replaced deprecated Switch with androidx SwitchCompat - Made the country dropdown centered on the main activity UI - Removed XML attributes that do nothing +dd348484 removed unused string resources from all locales +49da6819 ran lint to remove a lot of avoidable warnings +b12efdb7 ran android studio IDE code formatter +e7d9a8a1 Merge pull request #390 from bitmold/orbot-kt-modularization +1ce3bd05 Merge branch 'bitmold-orbot-kt-modularization' +17178d23 First stab at modularizing shared code between the app and app mini projects +9142dfdb (bitmold-orbot-kt-modularization) Merge branch 'orbot-kt-modularization' of https://github.com/bitmold/orbot into bitmold-orbot-kt-modularization +bf584ccf Merge branch 'master' of github.com:guardianproject/orbot +0e27fb0b Merge pull request #389 from bitmold/debug_log_once +64692ff1 First stab at modularizing shared code between the app and app mini projects +ccb03b94 Fixes #73 only log debug information one time if preference is enabled +9cca3d0f VpnConstants file isn't needed, redirects to another file +2b7dd42d VpnUtils.getSharedPrefs was an exact duplicate of Prefs.getSharedPrefs +b73ba828 removed big unneeded comments from orbotservice +2334ed0a Merge branch 'master' of https://github.com/guardianproject/orbot +c5b52f6c Revert "removed unused app module drawables" (this was a mistake, sorry) +13d57462 Merge pull request #387 from bitmold/new_identity_str +e46fb670 Merge pull request #385 from bitmold/delete_eclipse_files +0637afe3 (tag: 16.3.1-RC-1-tor-0.4.3.6) update version code for RC1 1631300100 +4fc4a097 removed unused placeholder assets +1c579b85 removed unused app module drawables +5a8cac6f Removed unused assets from orbotservice module +81346eb2 Added orbotservice module to transifex config +23e5b459 Removed old+unused update.json file to address concerns in #323 +dfd5d7a0 removed eclipse/ant build files +975053b7 Build instructions clarification + markdown +8555dea9 Updated BUILD, included instructions for windows +7ccdd01e remove versioning info in orbotservice build as it conflicts with app +0e76b617 update version code for play beta 1631200100 +1f715835 update changelog + /** 16.3.1-BETA-2-tor-0.4.3.6 / 24 August 2020 / d07dcb7ea5d6479ca5cf5c0a497837b4dc3961bf **/ d07dcb7e (HEAD -> master, tag: 16.3.1-BETA-2-tor-0.4.3.6, tag: 16.3.1-BETA-1-tor-0.4.3.6) update version code to 1631100200

1 0

[orbot/master] update to 16.3.2
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit c69a217aa8e1f09a34634da50e7af55c4fc73a21 Author: n8fr8 <nathan(a)guardianproject.info> Date: Tue Nov 3 08:53:34 2020 -0500 update to 16.3.2 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 3d069fa4..944c29d0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -77,7 +77,7 @@ android { minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 29 - versionCode 1631300100 + versionCode 1632300100 versionName getVersionName() archivesBaseName = "Orbot-$versionName" }

1 0

[orbot/master] update gradle and tools
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 075c6ddf84fa3fca5c3b213210b2e65ae2987d8a Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 12:11:28 2020 -0500 update gradle and tools --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index c6b04282..b1a1ab04 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.2' + classpath 'com.android.tools.build:gradle:4.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 52c10f65..26e19652 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 03 14:54:01 EDT 2020 +#Wed Nov 11 11:07:34 EST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip

1 0

[orbot/master] add IPtProxy as aar for now
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 0e33a6524271d22fdccf04445d94a9c79b4f6688 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 12:18:15 2020 -0500 add IPtProxy as aar for now --- orbotservice/build.gradle | 12 +++++++++++- orbotservice/libs/IPtProxy.aar | Bin 0 -> 29425327 bytes 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 39b23809..106e3a32 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -38,6 +38,13 @@ android { exclude 'assets/arm/obfs4proxy' //this is redundant } + repositories { + flatDir { + dir 'libs' + } + } + + } dependencies { @@ -49,7 +56,7 @@ dependencies { implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4' implementation 'com.jaredrummler:android-shell:1.0.0' - implementation fileTree(dir: 'libs', include: ['.so']) + implementation fileTree(dir: 'libs', include: ['.so','.aar']) implementation 'androidx.core:core:1.3.2' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' testImplementation 'junit:junit:4.13' @@ -58,4 +65,7 @@ dependencies { implementation 'info.guardianproject:jtorctl:0.4' + /*********** IPtProxy: https://github.com/tladesignz/IPtProxy **********/ + implementation(name: 'IPtProxy', ext: 'aar') + } diff --git a/orbotservice/libs/IPtProxy.aar b/orbotservice/libs/IPtProxy.aar new file mode 100644 index 00000000..ed76d5fb Binary files /dev/null and b/orbotservice/libs/IPtProxy.aar differ

1 0

[orbot/master] small changes to ensure handling of auto start on boot
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 50ee0d6f050ca11b1c4d72e1dd952b8044569a3c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 12:11:11 2020 -0500 small changes to ensure handling of auto start on boot --- app-mini/src/debug/AndroidManifest.xml | 132 ------------------------------ app/src/main/AndroidManifest.xml | 18 +--- orbotservice/src/main/AndroidManifest.xml | 2 + 3 files changed, 6 insertions(+), 146 deletions(-) diff --git a/app-mini/src/debug/AndroidManifest.xml b/app-mini/src/debug/AndroidManifest.xml deleted file mode 100644 index a06b3fe8..00000000 --- a/app-mini/src/debug/AndroidManifest.xml +++ /dev/null @@ -1,132 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<manifest xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="org.torproject.android.mini" - android:installLocation="internalOnly"> - - <uses-permission android:name="android.permission.INTERNET" /> - <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.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> -  - <uses-feature android:name="android.hardware.touchscreen" - android:required="false" /> - - <application - android:name=".OrbotMiniApp" - android:allowBackup="false" - android:allowClearUserData="true" - android:configChanges="locale|orientation|screenSize" - android:description="@string/app_description" - android:hardwareAccelerated="false" - android:icon="@mipmap/ic_launcher" - android:label="@string/app_name" - android:theme="@style/DefaultTheme" - tools:replace="android:allowBackup" - > - <activity - android:name=".MiniMainActivity" - android:excludeFromRecents="false" - android:launchMode="singleTop"> - <intent-filter> - <action android:name="android.intent.action.MAIN" /> - - <category android:name="android.intent.category.LAUNCHER" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW" /> - - <category android:name="android.intent.category.DEFAULT" /> - <category android:name="android.intent.category.BROWSABLE" /> - - <data android:scheme="bridge" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - - <action android:name="org.torproject.android.REQUEST_HS_PORT" /> - </intent-filter> - <intent-filter> - <category android:name="android.intent.category.DEFAULT" /> - - <action android:name="org.torproject.android.START_TOR" /> - </intent-filter> - </activity> - -  - <activity - android:name="org.torproject.android.service.util.DummyActivity" - android:allowTaskReparenting="true" - android:alwaysRetainTaskState="false" - android:clearTaskOnLaunch="true" - android:enabled="true" - android:excludeFromRecents="true" - android:finishOnTaskLaunch="true" - android:noHistory="true" - android:stateNotNeeded="true" - android:theme="@android:style/Theme.Translucent" /> - <activity - android:name=".vpn.VPNEnableActivity" - android:exported="false" - android:label="@string/app_name" /> - <activity - android:name=".settings.SettingsPreferencesActivity" - android:label="@string/app_name" /> - <activity - android:name=".ui.AppManagerActivity" - android:label="@string/app_name" - - android:theme="@style/Theme.AppCompat.Light" - /> - - <service - android:name="org.torproject.android.service.OrbotService" - android:enabled="true" - android:permission="android.permission.BIND_VPN_SERVICE" - android:stopWithTask="false"></service> - <service - android:name="org.torproject.android.service.vpn.TorVpnService" - android:enabled="true" - android:permission="android.permission.BIND_VPN_SERVICE"> - <intent-filter> - <action android:name="android.net.VpnService" /> - </intent-filter> - </service> - - <receiver - android:name="org.torproject.android.service.StartTorReceiver" - android:exported="true"> - <intent-filter> - <action android:name="org.torproject.android.intent.action.START" /> - </intent-filter> - </receiver> - <receiver - android:name=".OnBootReceiver" - android:enabled="true" - android:exported="true"> - <intent-filter> - <action android:name="android.intent.action.BOOT_COMPLETED" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MEDIA_MOUNTED" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - </receiver> - - - <activity android:name=".ui.onboarding.OnboardingActivity"/> - - - </application> - -</manifest> \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index af7f1d97..14482981 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,8 +17,7 @@ <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission - android:name="android.permission.WRITE_EXTERNAL_STORAGE" - android:maxSdkVersion="18" /> + android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" /> <application @@ -148,20 +147,11 @@ android:name=".core.OnBootReceiver" android:enabled="true" android:exported="true"> - <intent-filter> + <intent-filter android:directBootAware="true"> <action android:name="android.intent.action.BOOT_COMPLETED" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - <intent-filter> + <action android:name="android.intent.action.LOCKED_BOOT_COMPLETED" /> <action android:name="android.intent.action.QUICKBOOT_POWERON" /> - - <category android:name="android.intent.category.HOME" /> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.MEDIA_MOUNTED" /> - - <category android:name="android.intent.category.HOME" /> + <action android:name="android.intent.action.REBOOT"/> </intent-filter> </receiver> diff --git a/orbotservice/src/main/AndroidManifest.xml b/orbotservice/src/main/AndroidManifest.xml index 801a9c18..589ee334 100644 --- a/orbotservice/src/main/AndroidManifest.xml +++ b/orbotservice/src/main/AndroidManifest.xml @@ -1,4 +1,6 @@ <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android.service"> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> + + </manifest>

1 0

[orbot/master] the main app needs access to the aar for building as well
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit b3006347be6806b88146379599369cdf055762d4 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 12:47:22 2020 -0500 the main app needs access to the aar for building as well --- app/build.gradle | 5 +++++ app/libs/IPtProxy.aar | Bin 0 -> 29425327 bytes 2 files changed, 5 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 944c29d0..8c8810ff 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -117,6 +117,11 @@ android { } + repositories { + flatDir { + dir 'libs' + } + } } diff --git a/app/libs/IPtProxy.aar b/app/libs/IPtProxy.aar new file mode 100644 index 00000000..ed76d5fb Binary files /dev/null and b/app/libs/IPtProxy.aar differ

1 0

[orbot/master] add use IPtProxy function
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 8d7a79a52a9bf069f44d7e517983cbbf48ad590c Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 20:53:52 2020 -0500 add use IPtProxy function --- .../org/torproject/android/service/OrbotService.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 27b58c20..1b930f46 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotService.java @@ -314,11 +314,9 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb sendCallbackStatus(STATUS_STOPPING); sendCallbackLogMessage(getString(R.string.status_shutting_down)); - String bridgeList = Prefs.getBridgesList(); - boolean useIPtProxy = bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); - if (useIPtProxy) + if (useIPtProxy()) IPtProxy.stopObfs4Proxy(); - + killAllDaemons(); //stop the foreground priority and make sure to remove the persistant notification @@ -335,6 +333,12 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb } + private static boolean useIPtProxy () + { + String bridgeList = Prefs.getBridgesList(); + return bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); + } + private void killAllDaemons() throws Exception { if (conn != null) { @@ -1749,9 +1753,7 @@ public class OrbotService extends VpnService implements TorServiceConstants, Orb if (!TextUtils.isEmpty(action)) { if (action.equals(ACTION_START) || action.equals(ACTION_START_ON_BOOT)) { - String bridgeList = Prefs.getBridgesList(); - boolean useIPtProxy = bridgeList.contains("obfs3")|| bridgeList.contains("obfs4")||bridgeList.contains("meek"); - if (useIPtProxy) + if (useIPtProxy()) IPtProxy.startObfs4Proxy("DEBUG", false, false); startTor();

1 0

[orbot/master] modifying dependencies to support use of AAR for IPtProxy (temporarily)
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit be40bf56a8c8a9d195364402a91f90bec9014c44 Author: n8fr8 <nathan(a)guardianproject.info> Date: Wed Nov 11 12:47:57 2020 -0500 modifying dependencies to support use of AAR for IPtProxy (temporarily) --- orbotservice/build.gradle | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 106e3a32..a081735e 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -51,12 +51,15 @@ dependencies { implementation 'org.torproject:tor-android-binary:0.4.3.6-actual' + /** implementation 'info.pluggabletransports.aptds:apt-dispatch-library:1.0.9' implementation 'info.pluggabletransports.aptds:apt-meek-obfs4-legacy:1.0.9' + **/ implementation 'info.pluggabletransports.aptds:jsocksAndroid:1.0.4' implementation 'com.jaredrummler:android-shell:1.0.0' - implementation fileTree(dir: 'libs', include: ['.so','.aar']) + //implementation fileTree(dir: 'libs', include: ['.so','.aar']) + implementation 'androidx.core:core:1.3.2' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' testImplementation 'junit:junit:4.13'

1 0

[orbot/master] Updated outdated dependencies as per Android Studio's suggestions.
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit edc6cee9a0af017916e138284ab2060b9ee10e99 Author: Benjamin Erhart <berhart(a)netzarchitekten.com> Date: Thu Oct 8 09:52:19 2020 +0200 Updated outdated dependencies as per Android Studio's suggestions. --- app/build.gradle | 2 +- build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2b51efbd..36ef91a6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -122,7 +122,7 @@ android { dependencies { implementation project(':orbotservice') - implementation 'com.google.android.material:material:1.2.0' + implementation 'com.google.android.material:material:1.2.1' implementation 'pl.bclogic:pulsator4droid:1.0.3' implementation 'com.github.apl-devs:appintro:v4.2.2' implementation project(path: ':appcore') diff --git a/build.gradle b/build.gradle index c6b04282..f2f147b8 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.3.72' + kotlin_version = '1.4.10' } repositories { jcenter()

1 0

[orbot/master] update app-mini builds tools to 29.0.3
by n8fr8＠torproject.org 23 Dec '20

23 Dec '20

commit 804ce57a38b9872fb29de7b32eb47960485836b0 Author: bim <dsnake(a)protonmail.com> Date: Thu Oct 8 22:43:17 2020 -0400 update app-mini builds tools to 29.0.3 --- app-mini/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app-mini/build.gradle b/app-mini/build.gradle index 6cf3d7f3..01b30f4f 100644 --- a/app-mini/build.gradle +++ b/app-mini/build.gradle @@ -31,7 +31,7 @@ android { } compileSdkVersion 29 - buildToolsVersion '29.0.0' + buildToolsVersion '29.0.3' defaultConfig { applicationId "org.torproject.android.mini" minSdkVersion 16

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits December 2020