commit 2fb2ed69a007b25d1535817d798d382cbdef29f2 Merge: db7dd6d5 fe69a315 Author: n8fr8 nathan@guardianproject.info Date: Thu Feb 4 16:29:33 2021 -0500

Merge branch 'master' of github.com:guardianproject/orbot

app/src/main/AndroidManifest.xml | 11 ++-- .../torproject/android/ui/AppManagerActivity.java | 1 - .../ui/hiddenservices/HiddenServicesActivity.java | 13 ++-- .../ui/hiddenservices/backup/BackupUtils.java | 6 +- .../ui/hiddenservices/dialogs/AddCookieDialog.java | 2 +- .../ui/onboarding/BridgeWizardActivity.java | 2 - .../ui/onboarding/CustomBridgesActivity.java | 77 ++++++++-------------- .../android/ui/onboarding/MoatActivity.java | 2 - 8 files changed, 40 insertions(+), 74 deletions(-)