[tor-commits] [orbot/master] Merge branch 'Unpublished-deprecated_torrc'
n8fr8 at torproject.org
n8fr8 at torproject.org
Thu Sep 13 16:56:13 UTC 2018
commit 1bef963271634d0315b314016184f70f122e6525
Merge: 06c343c8 b2bf3d9a
Author: n8fr8 <nathan at freitas.net>
Date: Thu Sep 6 23:24:25 2018 -0400
Merge branch '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(-)
More information about the tor-commits
mailing list