[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[tor-commits] [orbot/master] Merge remote-tracking branch 'upstream/master'



commit a11e73a95f7bf111d5e2e8b80ecf4e192d8f6629
Merge: 4a5aad92 eeb31422
Author: Benjamin Erhart <berhart@xxxxxxxxxxxxxxxxxxx>
Date:   Tue Dec 15 11:52:16 2020 +0100

    Merge remote-tracking branch 'upstream/master'

 CHANGELOG                                          |  23 +++++
 INSTALL                                            |  40 --------
 IPtProxy/IPtProxy.aar                              | Bin 29425327 -> 0 bytes
 IPtProxy/build.gradle                              |   2 -
 LICENSE                                            |   2 +-
 README => README.md                                |   0
 TODO                                               |   8 --
 app-mini/src/main/res/values-ar/strings.xml        |   2 -
 app-mini/src/main/res/values-ay/strings.xml        |   2 -
 app-mini/src/main/res/values-az/strings.xml        |   2 -
 app-mini/src/main/res/values-be/strings.xml        |   2 -
 app-mini/src/main/res/values-bg/strings.xml        |   2 -
 app-mini/src/main/res/values-ca/strings.xml        |   2 -
 app-mini/src/main/res/values-cs-rCZ/strings.xml    |   2 -
 app-mini/src/main/res/values-de/strings.xml        |   2 -
 app-mini/src/main/res/values-el/strings.xml        |   2 -
 app-mini/src/main/res/values-es-rAR/strings.xml    |   2 -
 app-mini/src/main/res/values-es/strings.xml        |   2 -
 app-mini/src/main/res/values-eu/strings.xml        |   2 -
 app-mini/src/main/res/values-fa/strings.xml        |   2 -
 app-mini/src/main/res/values-fi/strings.xml        |   2 -
 app-mini/src/main/res/values-fr-rFR/strings.xml    |   2 -
 app-mini/src/main/res/values-fr/strings.xml        |   2 -
 app-mini/src/main/res/values-gl/strings.xml        |   2 -
 app-mini/src/main/res/values-he/strings.xml        |   2 -
 app-mini/src/main/res/values-hi/strings.xml        |   2 -
 app-mini/src/main/res/values-hr/strings.xml        |   2 -
 app-mini/src/main/res/values-hu/strings.xml        |   2 -
 app-mini/src/main/res/values-id/strings.xml        |   2 -
 app-mini/src/main/res/values-in-rID/strings.xml    |   2 -
 app-mini/src/main/res/values-is/strings.xml        |   2 -
 app-mini/src/main/res/values-it/strings.xml        |   2 -
 app-mini/src/main/res/values-iw/strings.xml        |   2 -
 app-mini/src/main/res/values-ja/strings.xml        |   2 -
 app-mini/src/main/res/values-ko/strings.xml        |   2 -
 app-mini/src/main/res/values-lv/strings.xml        |   2 -
 app-mini/src/main/res/values-mk/strings.xml        |   2 -
 app-mini/src/main/res/values-nb/strings.xml        |   2 -
 app-mini/src/main/res/values-nl/strings.xml        |   2 -
 app-mini/src/main/res/values-pl/strings.xml        |   2 -
 app-mini/src/main/res/values-pt-rBR/strings.xml    |   2 -
 app-mini/src/main/res/values-pt-rPT/strings.xml    |   2 -
 app-mini/src/main/res/values-pt/strings.xml        |   2 -
 app-mini/src/main/res/values-ro/strings.xml        |   2 -
 app-mini/src/main/res/values-ru/strings.xml        |   2 -
 app-mini/src/main/res/values-sk/strings.xml        |   2 -
 app-mini/src/main/res/values-sr/strings.xml        |   2 -
 app-mini/src/main/res/values-sv/strings.xml        |   2 -
 app-mini/src/main/res/values-th/strings.xml        |   2 -
 app-mini/src/main/res/values-tl/strings.xml        |   2 -
 app-mini/src/main/res/values-tr/strings.xml        |   2 -
 app-mini/src/main/res/values-uk/strings.xml        |   2 -
 app-mini/src/main/res/values-vi/strings.xml        |   2 -
 app-mini/src/main/res/values-zh-rCN/strings.xml    |   2 -
 app-mini/src/main/res/values-zh-rTW/strings.xml    |   2 -
 app-mini/src/main/res/values/strings.xml           |   4 -
 app/build.gradle                                   |   2 +-
 .../org/torproject/android/OrbotMainActivity.java  |  16 ++--
 .../ui/onboarding/BridgeWizardActivity.java        |  11 +++
 app/src/main/res/layout/content_bridge_wizard.xml  |   7 ++
 app/src/main/res/values-ar/strings.xml             |   4 -
 app/src/main/res/values-ay/strings.xml             |   4 -
 app/src/main/res/values-az/strings.xml             |   4 -
 app/src/main/res/values-be/strings.xml             |   4 -
 app/src/main/res/values-bg/strings.xml             |   4 -
 app/src/main/res/values-ca/strings.xml             |   4 -
 app/src/main/res/values-cs-rCZ/strings.xml         |   4 -
 app/src/main/res/values-da/strings.xml             |   2 -
 app/src/main/res/values-de/strings.xml             |   4 -
 app/src/main/res/values-el/strings.xml             |   4 -
 app/src/main/res/values-es-rAR/strings.xml         |   4 -
 app/src/main/res/values-es/strings.xml             |   4 -
 app/src/main/res/values-eu/strings.xml             |   4 -
 app/src/main/res/values-fa/strings.xml             |   4 -
 app/src/main/res/values-fi/strings.xml             |   4 -
 app/src/main/res/values-fr-rFR/strings.xml         |   4 -
 app/src/main/res/values-fr/strings.xml             |   4 -
 app/src/main/res/values-gl/strings.xml             |   4 -
 app/src/main/res/values-he/strings.xml             |   4 -
 app/src/main/res/values-hi/strings.xml             |   4 -
 app/src/main/res/values-hr/strings.xml             |   4 -
 app/src/main/res/values-hu/strings.xml             |   4 -
 app/src/main/res/values-id/strings.xml             |   4 -
 app/src/main/res/values-in-rID/strings.xml         |   4 -
 app/src/main/res/values-is/strings.xml             |   4 -
 app/src/main/res/values-it/strings.xml             |   4 -
 app/src/main/res/values-iw/strings.xml             |   4 -
 app/src/main/res/values-ja/strings.xml             |   4 -
 app/src/main/res/values-ko/strings.xml             |   4 -
 app/src/main/res/values-lv/strings.xml             |   4 -
 app/src/main/res/values-mk/strings.xml             |   4 -
 app/src/main/res/values-my/strings.xml             |   2 -
 app/src/main/res/values-nb/strings.xml             |   4 -
 app/src/main/res/values-nl/strings.xml             |   4 -
 app/src/main/res/values-pl/strings.xml             |   4 -
 app/src/main/res/values-pt-rBR/strings.xml         |   4 -
 app/src/main/res/values-pt-rPT/strings.xml         |   4 -
 app/src/main/res/values-pt/strings.xml             |   4 -
 app/src/main/res/values-ro/strings.xml             |   4 -
 app/src/main/res/values-ru/strings.xml             |   4 -
 app/src/main/res/values-si-rLK/strings.xml         |   2 -
 app/src/main/res/values-sk/strings.xml             |   4 -
 app/src/main/res/values-sr/strings.xml             |   4 -
 app/src/main/res/values-sv/strings.xml             |   4 -
 app/src/main/res/values-th/strings.xml             |   4 -
 app/src/main/res/values-tl/strings.xml             |   4 -
 app/src/main/res/values-tr/strings.xml             |   4 -
 app/src/main/res/values-uk/strings.xml             |   4 -
 app/src/main/res/values-vi/strings.xml             |   4 -
 app/src/main/res/values-zh-rCN/strings.xml         |   4 -
 app/src/main/res/values-zh-rTW/strings.xml         |   4 -
 app/src/main/res/values/strings.xml                |  12 +--
 docs/GSoC.txt                                      |  45 ---------
 docs/WALKTHROUGH                                   |  85 -----------------
 ic_launcher.svg => docs/ic_launcher.svg            |   0
 docs/onionroots.xcf                                | Bin 1748142 -> 0 bytes
 docs/orbotnewicons.xcf                             | Bin 1118257 -> 0 bytes
 orbotservice/build.gradle                          |   3 +-
 .../torproject/android/service/OrbotService.java   | 102 ++++++++++++---------
 orbotservice/src/main/res/raw-fa/bridges.txt       |   1 +
 orbotservice/src/main/res/raw/bridges.txt          |   1 +
 settings.gradle                                    |   1 -
 122 files changed, 119 insertions(+), 540 deletions(-)




_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits