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

[n8fr8 at torproject.org]

commit 2334ed0a65e57e6ebdedd600911b1b1c746a359e
Merge: c5b52f6c 13d57462
Author: bim <dsnake at protonmail.com>
Date:   Wed Sep 9 10:38:43 2020 -0400

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

 .classpath               | 13 -------
 .project                 | 79 -----------------------------------------
 .tx/config               |  7 ++++
 add-proguard-release.xml | 46 ------------------------
 bcdroid.manifest         |  3 --
 build.xml                | 92 ------------------------------------------------
 custom_rules.xml         | 57 ------------------------------
 7 files changed, 7 insertions(+), 290 deletions(-)