commit 510118ebce0ebf3aa07a3c83027780791302f422 Merge: f58ef4c0 53940073 Author: n8fr8 nathan@guardianproject.info Date: Fri Jun 7 15:20:45 2019 -0400

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

app/src/main/res/values/strings.xml | 8 +- app/src/main/res/xml-fa/preferences.xml | 230 --------------------------- orbotservice/src/main/res/values/pdnsd.xml | 2 +- orbotservice/src/main/res/values/strings.xml | 2 +- 4 files changed, 6 insertions(+), 236 deletions(-)