[tor-commits] [orbot/master] Merge remote-tracking branch 'upstream/master'

[n8fr8 at torproject.org]

commit 4a5aad9239cd3aacdc52f4df3bac2a736f797073
Merge: edc6cee9 e88c84aa
Author: Benjamin Erhart <berhart at netzarchitekten.com>
Date:   Wed Nov 25 12:55:18 2020 +0100

    Merge remote-tracking branch 'upstream/master'

 CHANGELOG                                          |  61 ++++
 IPtProxy/IPtProxy.aar                              | Bin 0 -> 29425327 bytes
 IPtProxy/build.gradle                              |   2 +
 app-mini/build.gradle                              |   2 +-
 app-mini/src/debug/AndroidManifest.xml             | 132 ---------
 app/build.gradle                                   |  15 +-
 app/src/main/AndroidManifest.xml                   |  15 +-
 .../java/org/torproject/android/MainConstants.java |   2 -
 .../org/torproject/android/OrbotMainActivity.java  |  43 +--
 build.gradle                                       |   2 +-
 gradle/wrapper/gradle-wrapper.properties           |   4 +-
 orbotservice/build.gradle                          |  12 +-
 orbotservice/src/main/AndroidManifest.xml          |   2 +
 .../torproject/android/service/OrbotService.java   | 308 +++++++++------------
 .../android/service/TorEventHandler.java           |   2 +-
 orbotservice/src/main/res/values/strings.xml       |   2 +
 settings.gradle                                    |   1 +
 17 files changed, 248 insertions(+), 357 deletions(-)