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

n8fr8 at torproject.org n8fr8 at torproject.org
Wed Oct 7 12:37:35 UTC 2020


commit bf584ccf61b89ac44daf2bd32503af7b3ee3257a
Merge: 0637afe3 0e27fb0b
Author: n8fr8 <nathan at guardianproject.info>
Date:   Thu Sep 10 22:13:59 2020 -0400

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

 .classpath                                         |  13 --
 .project                                           |  79 -----------
 .tx/config                                         |   7 +
 BUILD                                              |  42 ------
 BUILD.md                                           |  46 +++++++
 add-proguard-release.xml                           |  46 -------
 .../torproject/android/mini/MiniMainActivity.java  |   6 +-
 app/src/appmax/ic_launcher-web.png                 | Bin 26340 -> 0 bytes
 .../appmax/res/mipmap-anydpi-v26/ic_launcher.xml   |   5 -
 .../res/mipmap-anydpi-v26/ic_launcher_round.xml    |   5 -
 app/src/appmax/res/mipmap-hdpi/ic_launcher.png     | Bin 2858 -> 0 bytes
 .../res/mipmap-hdpi/ic_launcher_foreground.png     | Bin 2629 -> 0 bytes
 .../appmax/res/mipmap-hdpi/ic_launcher_round.png   | Bin 5049 -> 0 bytes
 app/src/appmax/res/mipmap-mdpi/ic_launcher.png     | Bin 1713 -> 0 bytes
 .../res/mipmap-mdpi/ic_launcher_foreground.png     | Bin 1663 -> 0 bytes
 .../appmax/res/mipmap-mdpi/ic_launcher_round.png   | Bin 2928 -> 0 bytes
 app/src/appmax/res/mipmap-xhdpi/ic_launcher.png    | Bin 3827 -> 0 bytes
 .../res/mipmap-xhdpi/ic_launcher_foreground.png    | Bin 3594 -> 0 bytes
 .../appmax/res/mipmap-xhdpi/ic_launcher_round.png  | Bin 6995 -> 0 bytes
 app/src/appmax/res/mipmap-xxhdpi/ic_launcher.png   | Bin 5759 -> 0 bytes
 .../res/mipmap-xxhdpi/ic_launcher_foreground.png   | Bin 5804 -> 0 bytes
 .../appmax/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10664 -> 0 bytes
 app/src/appmax/res/mipmap-xxxhdpi/ic_launcher.png  | Bin 7711 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_foreground.png  | Bin 8206 -> 0 bytes
 .../res/mipmap-xxxhdpi/ic_launcher_round.png       | Bin 14870 -> 0 bytes
 .../appmax/res/values/ic_launcher_background.xml   |   4 -
 .../org/torproject/android/OrbotMainActivity.java  |   6 +-
 bcdroid.manifest                                   |   3 -
 build.xml                                          |  92 -------------
 custom_rules.xml                                   |  57 --------
 .../torproject/android/service/OrbotService.java   | 149 ++++-----------------
 .../org/torproject/android/service/util/Prefs.java |  21 ++-
 .../android/service/vpn/OrbotVpnManager.java       |   5 +-
 .../android/service/vpn/VpnConstants.java          |  14 --
 .../torproject/android/service/vpn/VpnPrefs.java   |   9 +-
 .../torproject/android/service/vpn/VpnUtils.java   |  11 +-
 .../main/res/drawable-hdpi-v11/ic_stat_tor_off.png | Bin 944 -> 0 bytes
 orbotservice/src/main/res/drawable/ic_onion.xml    |   9 --
 orbotservice/src/main/res/drawable/ic_transfer.xml |   9 --
 .../notification_template_part_chronometer.xml     |  25 ----
 .../res/layout/notification_template_part_time.xml |  25 ----
 orbotservice/src/main/res/values-ar/strings.xml    |   7 +-
 orbotservice/src/main/res/values-az/strings.xml    |   9 +-
 orbotservice/src/main/res/values-bg/strings.xml    |   7 +-
 .../src/main/res/values-bn-rBD/strings.xml         |   2 -
 orbotservice/src/main/res/values-ca/strings.xml    |   2 -
 .../src/main/res/values-cs-rCZ/strings.xml         |   4 +-
 orbotservice/src/main/res/values-cs/strings.xml    |   2 -
 orbotservice/src/main/res/values-cy/strings.xml    |   2 -
 orbotservice/src/main/res/values-da/strings.xml    |   3 -
 orbotservice/src/main/res/values-de/strings.xml    |   7 +-
 orbotservice/src/main/res/values-el/strings.xml    |   2 -
 orbotservice/src/main/res/values-eo/strings.xml    |   2 -
 .../src/main/res/values-es-rAR/strings.xml         |   2 -
 orbotservice/src/main/res/values-es/strings.xml    |   7 +-
 orbotservice/src/main/res/values-et/strings.xml    |   4 -
 orbotservice/src/main/res/values-eu/strings.xml    |   3 -
 orbotservice/src/main/res/values-fa/strings.xml    |   7 +-
 orbotservice/src/main/res/values-fi/strings.xml    |   7 +-
 .../src/main/res/values-fr-rFR/strings.xml         |   7 +-
 orbotservice/src/main/res/values-fr/strings.xml    |   2 -
 orbotservice/src/main/res/values-gl/strings.xml    |   2 -
 orbotservice/src/main/res/values-he/strings.xml    |   7 +-
 orbotservice/src/main/res/values-hr/strings.xml    |   7 +-
 orbotservice/src/main/res/values-hu/strings.xml    |   7 +-
 orbotservice/src/main/res/values-id/strings.xml    |   7 +-
 .../src/main/res/values-in-rID/strings.xml         |   7 +-
 orbotservice/src/main/res/values-is/strings.xml    |   7 +-
 orbotservice/src/main/res/values-it/strings.xml    |   7 +-
 orbotservice/src/main/res/values-iw/strings.xml    |   7 +-
 orbotservice/src/main/res/values-ja/strings.xml    |   7 +-
 orbotservice/src/main/res/values-ko/strings.xml    |   2 -
 orbotservice/src/main/res/values-lv/strings.xml    |   7 +-
 orbotservice/src/main/res/values-mk/strings.xml    |   7 +-
 .../src/main/res/values-ms-rMY/strings.xml         |   2 -
 orbotservice/src/main/res/values-ms/strings.xml    |   2 -
 orbotservice/src/main/res/values-nb/strings.xml    |   7 +-
 orbotservice/src/main/res/values-nl/strings.xml    |   7 +-
 orbotservice/src/main/res/values-pl/strings.xml    |   7 +-
 .../src/main/res/values-pt-rBR/strings.xml         |   7 +-
 orbotservice/src/main/res/values-pt/strings.xml    |   6 +-
 orbotservice/src/main/res/values-ro/strings.xml    |   7 +-
 orbotservice/src/main/res/values-ru/strings.xml    |   7 +-
 .../src/main/res/values-si-rLK/strings.xml         |   2 -
 orbotservice/src/main/res/values-sk/strings.xml    |   2 -
 orbotservice/src/main/res/values-sl/strings.xml    |   2 -
 orbotservice/src/main/res/values-sr/strings.xml    |   2 -
 orbotservice/src/main/res/values-sv/strings.xml    |   7 +-
 orbotservice/src/main/res/values-ta/strings.xml    |   2 -
 orbotservice/src/main/res/values-th/strings.xml    |   1 -
 orbotservice/src/main/res/values-tl/strings.xml    |   3 -
 orbotservice/src/main/res/values-tr/strings.xml    |   7 +-
 orbotservice/src/main/res/values-uk/strings.xml    |   7 +-
 orbotservice/src/main/res/values-vi/strings.xml    |   7 +-
 .../src/main/res/values-zh-rCN/strings.xml         |   7 +-
 .../src/main/res/values-zh-rTW/strings.xml         |   2 -
 orbotservice/src/main/res/values/colors.xml        |   9 +-
 orbotservice/src/main/res/values/strings.xml       |  39 ++----
 update.json                                        |  10 --
 99 files changed, 141 insertions(+), 877 deletions(-)





More information about the tor-commits mailing list