commit b2bf3d9a4bce9976da3d557fb8b67032e321f30e Merge: 06c343c8 f74dea24 Author: n8fr8 <nathan@freitas.net> Date: Wed Sep 5 22:12:43 2018 -0400 Merge branch 'deprecated_torrc' of https://github.com/Unpublished/orbot into Unpublished-deprecated_torrc BUILD | 7 +- app/build.gradle | 4 +- app/proguard-rules.txt | 8 + .../ui/onboarding/BridgeWizardActivity.java | 212 ++++++--------------- app/src/main/res/layout/content_bridge_wizard.xml | 70 +++---- app/src/main/res/layout/layout_diag.xml | 14 -- app/src/main/res/values/strings.xml | 4 +- .../org/torproject/android/service/TorService.java | 5 +- .../android/service/util/NativeLoader.java | 6 +- 9 files changed, 108 insertions(+), 222 deletions(-)