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

[n8fr8 at torproject.org]

commit 6287db6d2a4dfc5fcd3c4c971b227c8d8a9e7ebf
Merge: 81d25780 482696b9
Author: n8fr8 <nathan at guardianproject.info>
Date:   Wed Aug 11 16:38:08 2021 -0400

    Merge branch 'bitmold-vpn_blocklist'

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