[tor-commits] [orbot/master] Merge branch 'dev_snowflake_new'

[n8fr8 at torproject.org]

commit 47b7b8054f1c8ad8b607677f7a03112c1bd3b8af
Merge: 823f4646 4a2e8b14
Author: n8fr8 <nathan at guardianproject.info>
Date:   Mon Dec 14 11:00:43 2020 -0500

    Merge branch 'dev_snowflake_new'

 IPtProxy/IPtProxy.aar                              | Bin 29425327 -> 0 bytes
 IPtProxy/build.gradle                              |   2 -
 .../ui/onboarding/BridgeWizardActivity.java        |  11 ++++
 app/src/main/res/layout/content_bridge_wizard.xml  |   7 +++
 app/src/main/res/values/strings.xml                |   1 +
 orbotservice/build.gradle                          |   3 +-
 .../torproject/android/service/OrbotService.java   |  62 ++++++++++++++-------
 orbotservice/src/main/res/raw-fa/bridges.txt       |   1 +
 orbotservice/src/main/res/raw/bridges.txt          |   1 +
 settings.gradle                                    |   1 -
 10 files changed, 63 insertions(+), 26 deletions(-)