commit 71545226e0ac38279307c9085bb2630b4358e3cc Merge: 5fc9f872 491e3572 Author: n8fr8 nathan@guardianproject.info Date: Wed Jun 2 17:17:14 2021 -0400

Merge branch 'bitmold-tor_event_bandwidth'

.../org/torproject/android/OrbotMainActivity.java | 44 ++++++++-------------- app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-fr-rFR/strings.xml | 2 - app/src/main/res/values-is/strings.xml | 2 - app/src/main/res/values-nb/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-pt/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values/strings.xml | 2 - appcore/build.gradle | 1 - .../torproject/android/service/OrbotService.java | 38 +++++++++---------- .../android/service/TorEventHandler.java | 35 +++-------------- orbotservice/src/main/res/values-de/strings.xml | 2 + .../src/main/res/values-fr-rFR/strings.xml | 2 + orbotservice/src/main/res/values-is/strings.xml | 3 ++ orbotservice/src/main/res/values-nb/strings.xml | 2 + .../src/main/res/values-pt-rBR/strings.xml | 2 + .../src/main/res/values-pt-rPT/strings.xml | 3 ++ orbotservice/src/main/res/values-pt/strings.xml | 2 + orbotservice/src/main/res/values-tr/strings.xml | 2 + orbotservice/src/main/res/values-uk/strings.xml | 2 + orbotservice/src/main/res/values-vi/strings.xml | 2 + .../src/main/res/values-zh-rCN/strings.xml | 2 + orbotservice/src/main/res/values/strings.xml | 5 +++ 28 files changed, 66 insertions(+), 105 deletions(-)