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

[n8fr8 at torproject.org]

commit c4062678c3bcd2f5835a087405a52c83beafcd00
Merge: ecdff5ce 811c09aa
Author: n8fr8 <nathan at guardianproject.info>
Date:   Fri Jun 14 23:07:50 2019 -0400

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

 .settings/.jsdtscope                                  | 11 -----------
 .settings/org.eclipse.wst.jsdt.ui.superType.container |  1 -
 .settings/org.eclipse.wst.jsdt.ui.superType.name      |  1 -
 app/src/main/res/values/strings.xml                   |  2 +-
 4 files changed, 1 insertion(+), 14 deletions(-)