[tor-commits] [orbot/master] Merge branch 'isolateDest' of https://github.com/SpotComms/orbot into SpotComms-isolateDest

[n8fr8 at torproject.org]

commit 8bbf0ba7995f1dbbb550624512aed086c96b11e0
Merge: 750a282e 18dd53d4
Author: n8fr8 <nathan at freitas.net>
Date:   Tue Oct 31 09:44:08 2017 -0400

    Merge branch 'isolateDest' of https://github.com/SpotComms/orbot into SpotComms-isolateDest

 app/src/main/res/values/strings.xml                              | 5 ++---
 app/src/main/res/xml/preferences.xml                             | 9 +++++++++
 .../main/java/org/torproject/android/service/OrbotConstants.java | 4 +++-
 .../src/main/java/org/torproject/android/service/TorService.java | 8 +++++++-
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --cc app/src/main/res/values/strings.xml
index 90fc3e4c,5bb7d909..4b10ee13
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@@ -380,7 -380,7 +380,6 @@@
      <string name="enable">Enable</string>
      <string name="consider_disable_battery_optimizations">Consider disable battery optimizations</string>
      <string name="consider_enable_battery_optimizations">Consider enable battery optimizations</string>
--
-   <string name="no_transproxy_warning_short">WARNING: Transproxying no longer supported</string>
-   <string name="no_transproxy_warning">WARNING: Transparent proxying not supported. Use Orbot Apps VPN instead.</string>
+   <string name="pref_isolate_dest">Isolate destination addresses</string>
+   <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string>
  </resources>