commit 4bbca2927d66b6a77e5a52bd9815810bdf77c95a Author: Nathan Freitas nathan@freitas.net Date: Thu Jan 12 20:57:38 2012 -0500

added new pref for using built-in iptables binary --- res/values/strings.xml | 4 ++++ res/xml/preferences.xml | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml index 08bc34b..2ca91be 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -248,4 +248,8 @@ <string name="hidden_service_on">hidden service on:</string> <string name="unable_to_read_hidden_service_name">unable to read hidden service name</string> <string name="unable_to_start_tor">Unable to start Tor:</string> + +<string name="pref_use_sys_iptables_title">Use Default Iptables</string> +<string name="pref_use_sys_iptables_summary">use the built-in iptables binary instead of the one bundled with Orbot</string> + </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 62eadc0..743cf27 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -176,6 +176,14 @@ android:summary="@string/enable_debug_log_to_output_must_use_adb_or_alogcat_to_v android:enabled="true"></CheckBoxPreference>

+ +<CheckBoxPreference +android:defaultValue="false" +android:key="pref_use_sys_iptables" +android:summary="@string/pref_use_sys_iptables_summary" +android:enabled="true" +android:title="@string/pref_use_sys_iptables_title"/> + <CheckBoxPreference android:defaultValue="false" android:key="pref_transparent_port_fallback"