commit a0e9460effd20b049a3c342e77b952058144f816 Merge: 2b394294 07e77940 Author: n8fr8 nathan@guardianproject.info Date: Tue Oct 20 13:56:56 2020 -0400

Merge branch 'master' of github.com:guardianproject/orbot

.../org/torproject/android/OrbotMainActivity.java | 32 ++++-- .../torproject/android/service/OrbotService.java | 115 ++++++++------------- .../android/service/TorEventHandler.java | 2 +- 3 files changed, 64 insertions(+), 85 deletions(-)