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

[n8fr8 at torproject.org]

commit c30011869c6dbb49816122e839e5b84e75c4a5b5
Merge: 53cdad1f 992b3108
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Aug 3 15:01:02 2020 -0400

    Merge branch 'bitmold-vpn_disable'

 .../org/torproject/android/OrbotMainActivity.java  | 22 +++++++++++++++++++++-
 .../torproject/android/service/OrbotService.java   | 15 ++++++++++++---
 2 files changed, 33 insertions(+), 4 deletions(-)