commit a9168d2df8159046d22e51861c2f7380579d67f9 Merge: bd3bc7b3 5f296ccc Author: n8fr8 nathan@guardianproject.info Date: Mon Jul 13 12:14:11 2020 -0400

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

app-mini/src/main/AndroidManifest.xml | 4 - .../torproject/android/mini/MiniMainActivity.java | 52 ++++----- .../torproject/android/mini/OnBootReceiver.java | 25 +---- .../android/mini/vpn/VPNEnableActivity.java | 121 --------------------- app/src/main/AndroidManifest.xml | 13 +-- .../ui/hiddenservices/ClientCookiesActivity.java | 15 +-- .../ui/hiddenservices/HiddenServicesActivity.java | 21 ++-- .../dialogs/CookieActionsDialog.java | 97 +++++++++-------- .../ui/hiddenservices/dialogs/HSActionsDialog.java | 88 +++++++-------- .../ui/onboarding/CustomBridgesActivity.java | 33 +++++- .../android/ui/onboarding/MoatActivity.java | 1 + app/src/main/res/layout/activity_moat.xml | 1 + app/src/main/res/values-ar/strings.xml | 3 +- app/src/main/res/values-ay/strings.xml | 3 +- app/src/main/res/values-be/strings.xml | 3 +- app/src/main/res/values-ca/strings.xml | 3 +- app/src/main/res/values-de/strings.xml | 3 +- app/src/main/res/values-el/strings.xml | 3 +- app/src/main/res/values-es/strings.xml | 3 +- app/src/main/res/values-eu/strings.xml | 3 +- app/src/main/res/values-fa/strings.xml | 3 +- app/src/main/res/values-fr/strings.xml | 3 +- app/src/main/res/values-gl/strings.xml | 3 +- app/src/main/res/values-he/strings.xml | 3 +- app/src/main/res/values-hi/strings.xml | 3 +- app/src/main/res/values-hu/strings.xml | 3 +- app/src/main/res/values-is/strings.xml | 3 +- app/src/main/res/values-it/strings.xml | 3 +- app/src/main/res/values-ja/strings.xml | 3 +- app/src/main/res/values-mk/strings.xml | 3 +- app/src/main/res/values-nb/strings.xml | 3 +- app/src/main/res/values-nl/strings.xml | 3 +- app/src/main/res/values-pt-rBR/strings.xml | 3 +- app/src/main/res/values-ru/strings.xml | 3 +- app/src/main/res/values-sr/strings.xml | 3 +- app/src/main/res/values-sv/strings.xml | 3 +- app/src/main/res/values-th/strings.xml | 3 +- app/src/main/res/values-tr/strings.xml | 3 +- app/src/main/res/values-uk/strings.xml | 3 +- app/src/main/res/values-zh-rTW/strings.xml | 3 +- app/src/main/res/values/strings.xml | 1 - 41 files changed, 209 insertions(+), 347 deletions(-)