[tor-commits] [orbot/master] Merge branch 'master' of github.com:guardianproject/orbot

[n8fr8 at torproject.org]

commit bca48cc947e4798c8f932cd28523c61e4cae67d9
Merge: 7e223f02 df0cfc80
Author: n8fr8 <nathan at guardianproject.info>
Date:   Tue Jul 13 11:27:59 2021 -0400

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

 .../android/service/vpn/OrbotVpnManager.java          | 19 +++++++++++++------
 orbotservice/src/main/res/values/pdnsd.xml            |  1 +
 2 files changed, 14 insertions(+), 6 deletions(-)