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

[n8fr8 at torproject.org]

commit a85658355877a3c97f403ed56d36e5191fccad08
Merge: 81d25780 9759e94f
Author: n8fr8 <nathan at guardianproject.info>
Date:   Wed Aug 11 16:30:05 2021 -0400

    Merge branch 'vpn_blocklist' of https://github.com/bitmold/orbot into bitmold-vpn_blocklist

 .../java/org/torproject/android/ui/AppManagerActivity.java  |  9 +++++++--
 .../org/torproject/android/service/vpn/OrbotVpnManager.java |  5 +++--
 .../org/torproject/android/service/vpn/TorifiedApp.java     | 13 +++++--------
 .../java/org/torproject/android/service/vpn/VpnPrefs.java   | 10 ++++++++++
 4 files changed, 25 insertions(+), 12 deletions(-)