commit 875f18adc5eb5e50dbebcb8bbaf9d4387d57d1a0 Merge: 12a3f4a9 718bb421 Author: n8fr8 nathan@guardianproject.info Date: Mon May 4 11:14:33 2020 -0400

Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master

app/src/main/AndroidManifest.xml | 1 + .../java/org/torproject/android/MainConstants.java | 4 +- .../ui/onboarding/BridgeWizardActivity.java | 90 ++------- .../ui/onboarding/CustomBridgesActivity.java | 219 +++++++++++++++++++++ .../android/ui/onboarding/MoatActivity.java | 31 ++- .../main/res/layout/activity_custom_bridges.xml | 100 ++++++++++ app/src/main/res/layout/content_bridge_wizard.xml | 20 +- app/src/main/res/values/strings.xml | 11 +- 8 files changed, 388 insertions(+), 88 deletions(-)