commit 71e3464358e9c7a8a4385f9b5157225175d2f378 Merge: 1b904125 cbffc1d6 Author: Nathan Freitas nathan@freitas.net Date: Wed Nov 1 12:22:32 2017 -0400

Merge pull request #94 from Unpublished/fix88

remove some transproxy left overs

app/src/main/res/xml/preferences.xml | 14 ++++---------- .../java/org/torproject/android/service/TorService.java | 1 - .../java/org/torproject/android/service/util/Prefs.java | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-)