[tor-commits] [orbot/master] Merge branch 'master' of https://github.com/tladesignz/orbot into tladesignz-master

[n8fr8@xxxxxxxxxxxxxx]

commit f2c8473fe781d246dd9078576c1474c06ba999da
Merge: 732c1538 19d50544
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Fri Apr 24 17:07:53 2020 -0400

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

 BUILD                                              |   3 +
 app/build.gradle                                   |  11 +-
 app/src/main/AndroidManifest.xml                   | 139 +--
 .../org/torproject/android/OrbotMainActivity.java  | 937 ++++++++++-----------
 .../ui/onboarding/BridgeWizardActivity.java        | 133 ++-
 .../android/ui/onboarding/MoatActivity.java        | 428 ++++++++++
 .../android/ui/onboarding/ProxiedHurlStack.java    |  33 +
 app/src/main/res/layout/activity_moat.xml          |  81 ++
 app/src/main/res/layout/content_bridge_wizard.xml  |   9 +-
 app/src/main/res/menu/moat.xml                     |  28 +
 app/src/main/res/values/strings.xml                |  16 +-
 build.gradle                                       |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   4 +-
 13 files changed, 1215 insertions(+), 609 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits