[tor-commits] [orbot/master] Merge branch 'bitmold-bug_tor_wont_stop_with_activeVPN'

[n8fr8 at torproject.org]

commit 1ecca6b8bb2ed85cf4225bb9790136b0d736f31b
Merge: da5f80d7 b2b92d6b
Author: n8fr8 <nathan at guardianproject.info>
Date:   Sat May 30 06:30:06 2020 -0400

    Merge branch 'bitmold-bug_tor_wont_stop_with_activeVPN'

 .../org/torproject/android/OrbotMainActivity.java  |  53 ++++-----
 .../torproject/android/service/OrbotService.java   |  37 ++-----
 .../android/service/vpn/OrbotVpnManager.java       | 123 ++++-----------------
 3 files changed, 56 insertions(+), 157 deletions(-)