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

[n8fr8@xxxxxxxxxxxxxx]

commit dd7152e95579a5ebe447b06e939acda288de93b7
Merge: aa643f4a 40c3da9d
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Wed May 5 09:25:12 2021 -0400

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

 .gitmodules                                        |   4 -
 app-mini/build.gradle                              |   2 +-
 app-mini/src/main/assets/common/geoip              |   0
 app-mini/src/main/assets/common/geoip6             |   0
 .../torproject/android/mini/MiniMainActivity.java  |   5 +-
 app/build.gradle                                   |   5 +-
 .../org/torproject/android/OrbotMainActivity.java  |   3 +-
 .../ui/onboarding/CustomBridgesActivity.java       |   4 +-
 .../android/ui/onboarding/MoatActivity.java        |   6 +-
 external/jtorctl                                   |   1 -
 orbotservice/build.gradle                          |  11 +-
 .../torproject/android/service/OrbotService.java   | 455 ++++---------
 .../android/service/TorServiceConstants.java       |  12 -
 .../service/util/CustomTorResourceInstaller.java   |  71 +-
 .../java/org/torproject/android/control/.cvsignore |   1 -
 .../java/org/torproject/android/control/Bytes.java | 114 ----
 .../torproject/android/control/ConfigEntry.java    |  20 -
 .../torproject/android/control/EventHandler.java   |  75 ---
 .../torproject/android/control/PasswordDigest.java |  98 ---
 .../java/org/torproject/android/control/README     |   4 -
 .../android/control/TorControlCommands.java        | 148 -----
 .../android/control/TorControlConnection.java      | 730 ---------------------
 .../android/control/TorControlError.java           |  39 --
 .../android/control/TorControlSyntaxError.java     |  16 -
 .../torproject/android/control/examples/.cvsignore |   1 -
 .../control/examples/DebuggingEventHandler.java    |  44 --
 .../torproject/android/control/examples/Main.java  | 146 -----
 .../android/service/ExampleUnitTest.java           |  15 -
 28 files changed, 173 insertions(+), 1857 deletions(-)



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