tor-commits October 2017

tor-commits@lists.torproject.org

17 participants
2004 discussions

[tor/master] When hibernating, close connections normally and allow them to flush
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit e57604183cf5a0fb9e99522cbd7f1548784d63a8 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 19 14:17:35 2017 +1000 When hibernating, close connections normally and allow them to flush Bugfix on 7267 in 0.2.4.7-alpha --- changes/bug23571 | 3 +++ src/or/hibernate.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/changes/bug23571 b/changes/bug23571 new file mode 100644 index 000000000..9d4c4082a --- /dev/null +++ b/changes/bug23571 @@ -0,0 +1,3 @@ + o Minor bugfixes (hibernation): + - When hibernating, close connections normally and allow them to flush. + Bugfix on 7267 in 0.2.4.7-alpha. diff --git a/src/or/hibernate.c b/src/or/hibernate.c index 8c48a6f47..e60306a73 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -34,6 +34,7 @@ hibernating, phase 2: #include "config.h" #include "connection.h" #include "connection_edge.h" +#include "connection_or.h" #include "control.h" #include "hibernate.h" #include "main.h" @@ -914,7 +915,7 @@ hibernate_go_dormant(time_t now) END_STREAM_REASON_HIBERNATING); else if (conn->type == CONN_TYPE_OR) { if (TO_OR_CONN(conn)->chan) { - channel_mark_for_close(TLS_CHAN_TO_BASE(TO_OR_CONN(conn)->chan)); + connection_or_close_normally(TO_OR_CONN(conn), 0); } else { connection_mark_for_close(conn); }

1 0

[tor/master] Consistently use braced blocks in hibernate_go_dormant()
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit e9f57e193d75f5c61b05dafb1c1585e5b1762866 Author: teor <teor2345(a)gmail.com> Date: Tue Sep 19 14:18:25 2017 +1000 Consistently use braced blocks in hibernate_go_dormant() --- src/or/hibernate.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/or/hibernate.c b/src/or/hibernate.c index e60306a73..558180b45 100644 --- a/src/or/hibernate.c +++ b/src/or/hibernate.c @@ -907,20 +907,23 @@ hibernate_go_dormant(time_t now) while ((conn = connection_get_by_type(CONN_TYPE_OR)) || (conn = connection_get_by_type(CONN_TYPE_AP)) || (conn = connection_get_by_type(CONN_TYPE_EXIT))) { - if (CONN_IS_EDGE(conn)) + if (CONN_IS_EDGE(conn)) { connection_edge_end(TO_EDGE_CONN(conn), END_STREAM_REASON_HIBERNATING); + } log_info(LD_NET,"Closing conn type %d", conn->type); - if (conn->type == CONN_TYPE_AP) /* send socks failure if needed */ + if (conn->type == CONN_TYPE_AP) { + /* send socks failure if needed */ connection_mark_unattached_ap(TO_ENTRY_CONN(conn), END_STREAM_REASON_HIBERNATING); - else if (conn->type == CONN_TYPE_OR) { + } else if (conn->type == CONN_TYPE_OR) { if (TO_OR_CONN(conn)->chan) { connection_or_close_normally(TO_OR_CONN(conn), 0); } else { connection_mark_for_close(conn); } - } else + } else { connection_mark_for_close(conn); + } } if (now < interval_wakeup_time)

1 0

[tor/master] Merge branch 'bug23571_033_squashed'
by nickm＠torproject.org 31 Oct '17

31 Oct '17

commit c9ad172dd4081fbb3cd5e2995a79d3e449b7e474 Merge: cf98ca715 e9f57e193 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 31 11:59:18 2017 -0400 Merge branch 'bug23571_033_squashed' changes/bug23571 | 3 +++ src/or/hibernate.c | 14 +++++++++----- 2 files changed, 12 insertions(+), 5 deletions(-)

1 0

[orbot/master] Expose IsolateDestAddr
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 18dd53d4194269f1082b82d8b216bbb62e4c80f4 Author: Tad <tad(a)spotco.us> Date: Thu Aug 3 11:22:42 2017 -0400 Expose IsolateDestAddr --- app/src/main/res/values/strings.xml | 3 +++ 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, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 41b9e816..5bb7d909 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -380,4 +380,7 @@ <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="pref_isolate_dest">Isolate destination addresses</string> + <string name="pref_isolate_dest_summary">Use a different circuit for each destination address</string> </resources> diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index c20dc4fa..c3f07a8d 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -157,6 +157,15 @@ android:dialogTitle="@string/enter_ports" /> </PreferenceCategory> +<PreferenceCategory android:title="Isolation"> +<CheckBoxPreference +android:key="pref_isolate_dest" +android:defaultValue="false" +android:title="@string/pref_isolate_dest" +android:summary="@string/pref_isolate_dest_summary" +android:enabled="true"></CheckBoxPreference> +</PreferenceCategory> + <PreferenceCategory android:title="@string/pref_proxy_title"> <EditTextPreference android:key="pref_proxy_type" android:title="@string/pref_proxy_type_title" diff --git a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java index 665cf0c6..175ebf81 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java +++ b/orbotservice/src/main/java/org/torproject/android/service/OrbotConstants.java @@ -33,5 +33,7 @@ public interface OrbotConstants { public final static int MAX_LOG_LENGTH = 10000; public final static String PREF_SOCKS = "pref_socks"; - + + public final static String PREF_ISOLATE_DEST = "pref_isolate_dest"; + } diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java index 17000a9d..ce47799d 100644 --- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java +++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java @@ -675,8 +675,14 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon if (isPortUsed) //the specified port is not available, so let Tor find one instead socksPortPref = "auto"; } + + String isolate = " "; + if(prefs.getBoolean(OrbotConstants.PREF_ISOLATE_DEST, false)) + { + isolate += "IsolateDestAddr"; + } - extraLines.append("SOCKSPort ").append(socksPortPref).append('\n'); + extraLines.append("SOCKSPort ").append(socksPortPref).append(isolate).append('\n'); extraLines.append("SafeSocks 0").append('\n'); extraLines.append("TestSocks 0").append('\n'); extraLines.append("WarnUnsafeSocks 1").append('\n');

1 0

[orbot/master] Merge pull request #76 from dixidroid/master
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 14367e0add8f757a8a249df348724f15550c66b1 Merge: 8bbf0ba7 2922e487 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Oct 31 09:45:19 2017 -0400 Merge pull request #76 from dixidroid/master fixed crash when an user tries to add the same hidden service port twice app/src/main/java/org/torproject/android/OrbotMainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[orbot/master] update to latest build tools and gradle
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 750a282e2087310c08b1a91dd6a111e36bdf7f5f Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 31 09:42:01 2017 -0400 update to latest build tools and gradle - add new flavordimension tag --- app/build.gradle | 7 ++++++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- jsocksAndroid/build.gradle | 2 +- orbotservice/build.gradle | 2 +- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d8da8a1a..9ee6da95 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "25" + buildToolsVersion '26.0.2' defaultConfig { applicationId "org.torproject.android" minSdkVersion 16 @@ -20,8 +20,12 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' } } + + flavorDimensions "free" + productFlavors { minimalperm { + dimension "free" minSdkVersion 16 applicationId 'org.torproject.android' targetSdkVersion 23 @@ -30,6 +34,7 @@ android { versionName '15.5.0-RC-1-multi-SDK16' } fullperm { + dimension "free" minSdkVersion 23 applicationId 'org.torproject.android' targetSdkVersion 25 diff --git a/build.gradle b/build.gradle index 8674409c..85852420 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.0' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1b8daf6c..c77faa60 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Mar 19 08:31:31 EDT 2017 +#Tue Oct 31 09:37:18 EDT 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip diff --git a/jsocksAndroid/build.gradle b/jsocksAndroid/build.gradle index b3c2e0ad..12c743fd 100644 --- a/jsocksAndroid/build.gradle +++ b/jsocksAndroid/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "25" + buildToolsVersion '26.0.2' defaultConfig { minSdkVersion 8 diff --git a/orbotservice/build.gradle b/orbotservice/build.gradle index 12407532..82a6aa78 100644 --- a/orbotservice/build.gradle +++ b/orbotservice/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 25 - buildToolsVersion "25" + buildToolsVersion '26.0.2' sourceSets { main {

1 0

[orbot/master] update VPN app manager to load async, and sort selected to top
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 5b9eedba1d31240cfe16179515c13953e6eca4ef Author: n8fr8 <nathan(a)freitas.net> Date: Tue Oct 31 10:21:13 2017 -0400 update VPN app manager to load async, and sort selected to top --- app/src/fullperm/AndroidManifest.xml | 2 +- app/src/main/AndroidManifest.xml | 2 +- .../org/torproject/android/OrbotMainActivity.java | 6 +- .../android/settings/SettingsPreferences.java | 5 - .../{AppManager.java => AppManagerActivity.java} | 129 +++++++-------------- app/src/minimalperm/AndroidManifest.xml | 2 +- 6 files changed, 47 insertions(+), 99 deletions(-) diff --git a/app/src/fullperm/AndroidManifest.xml b/app/src/fullperm/AndroidManifest.xml index dadd11c8..0c1b4185 100644 --- a/app/src/fullperm/AndroidManifest.xml +++ b/app/src/fullperm/AndroidManifest.xml @@ -79,7 +79,7 @@ android:name=".settings.SettingsPreferences" android:label="@string/app_name" /> <activity - android:name=".ui.AppManager" + android:name=".ui.AppManagerActivity" android:label="@string/app_name" android:theme="@style/Theme.AppCompat" /> diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 94c33920..387b53f2 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -71,7 +71,7 @@ android:name=".settings.SettingsPreferences" android:label="@string/app_name" /> <activity - android:name=".ui.AppManager" + android:name=".ui.AppManagerActivity" android:label="@string/app_name" android:theme="@style/Theme.AppCompat" /> diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java index ed7894d3..2c45d0f6 100644 --- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java +++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java @@ -12,9 +12,7 @@ import java.net.URLDecoder; import java.net.URLEncoder; import java.text.NumberFormat; import java.util.ArrayList; -import java.util.Collections; import java.util.Locale; -import java.util.Random; import java.util.StringTokenizer; import org.json.JSONArray; @@ -24,7 +22,7 @@ import org.torproject.android.service.TorService; import org.torproject.android.service.TorServiceConstants; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.settings.SettingsPreferences; -import org.torproject.android.ui.AppManager; +import org.torproject.android.ui.AppManagerActivity; import org.torproject.android.ui.ImageProgressView; import org.torproject.android.ui.PromoAppsActivity; import org.torproject.android.ui.Rotate3dAnimation; @@ -617,7 +615,7 @@ public class OrbotMainActivity extends AppCompatActivity if (enable) { if (PermissionManager.isLollipopOrHigher()) //let the user choose the apps - startActivityForResult(new Intent(OrbotMainActivity.this, AppManager.class), REQUEST_VPN_APPS_SELECT); + startActivityForResult(new Intent(OrbotMainActivity.this, AppManagerActivity.class), REQUEST_VPN_APPS_SELECT); else startActivity(new Intent(OrbotMainActivity.this, VPNEnableActivity.class)); } else diff --git a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java index 74986779..a51c1097 100644 --- a/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java +++ b/app/src/main/java/org/torproject/android/settings/SettingsPreferences.java @@ -4,21 +4,16 @@ package org.torproject.android.settings; import android.content.Context; -import android.content.Intent; import android.content.SharedPreferences; -import android.os.Build; import android.os.Bundle; -import android.preference.CheckBoxPreference; import android.preference.ListPreference; import android.preference.Preference; import android.preference.Preference.OnPreferenceChangeListener; import android.preference.Preference.OnPreferenceClickListener; import android.preference.PreferenceActivity; -import android.util.Log; import org.torproject.android.OrbotApp; import org.torproject.android.R; -import org.torproject.android.ui.AppManager; import org.torproject.android.service.util.TorServiceUtils; import java.util.Locale; diff --git a/app/src/main/java/org/torproject/android/ui/AppManager.java b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java similarity index 76% rename from app/src/main/java/org/torproject/android/ui/AppManager.java rename to app/src/main/java/org/torproject/android/ui/AppManagerActivity.java index e54898de..9d909f54 100644 --- a/app/src/main/java/org/torproject/android/ui/AppManager.java +++ b/app/src/main/java/org/torproject/android/ui/AppManagerActivity.java @@ -6,6 +6,7 @@ package org.torproject.android.ui; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; +import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.StringTokenizer; @@ -15,38 +16,35 @@ import org.torproject.android.R; import org.torproject.android.service.util.TorServiceUtils; import org.torproject.android.service.vpn.TorifiedApp; -import android.app.Activity; +import android.app.ProgressDialog; import android.content.Context; import android.content.SharedPreferences; import android.content.SharedPreferences.Editor; import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.PackageManager; -import android.content.pm.ResolveInfo; +import android.os.AsyncTask; import android.os.Bundle; import android.support.v7.app.AppCompatActivity; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; -import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ArrayAdapter; -import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.GridView; import android.widget.ImageView; import android.widget.ListAdapter; -import android.widget.ListView; import android.widget.TextView; -public class AppManager extends AppCompatActivity implements OnCheckedChangeListener, OnClickListener, OrbotConstants { +public class AppManagerActivity extends AppCompatActivity implements OnCheckedChangeListener, OnClickListener, OrbotConstants { private GridView listApps; + private ListAdapter adapterApps; private final static String TAG = "Orbot"; PackageManager pMgr = null; @@ -61,83 +59,43 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList } - /** - class OnAutoClickListener implements Button.OnClickListener { - private int status; - public OnAutoClickListener(int status){ - this.status = status; - } - @SuppressWarnings("unchecked") - public void onClick(View button){ - GridView listView; - ViewGroup viewGroup; - View parentView, currentView; - ArrayAdapter<TorifiedApp> adapter; - TorifiedApp app; - CheckBox box; - float buttonId; - boolean[] isSelected; - int posI, selectedI, lvSz; - - buttonId = button.getId(); - listView = (GridView) findViewById(R.id.applistview); - lvSz = listView.getCount(); - isSelected = new boolean[lvSz]; - - selectedI = -1; - - if (this.status == 0){ - Log.d(TAG, "Proxifying ALL"); - }else if (this.status == 1){ - Log.d(TAG, "Proxifying NONE"); - }else { - Log.d(TAG, "Proxifying invert"); - } - - Context context = getApplicationContext(); - SharedPreferences prefs = TorServiceUtils.getSharedPrefs(context); - ArrayList<TorifiedApp> apps = getApps(context, prefs); - parentView = (View) findViewById(R.id.applistview); - viewGroup = (ViewGroup) listView; - - adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter(); - if (adapter == null){ - Log.w(TAG, "List adapter is null. Getting apps."); - loadApps(prefs); - adapter = (ArrayAdapter<TorifiedApp>) listApps.getAdapter(); - } - - for (int i = 0 ; i < adapter.getCount(); ++i){ - app = (TorifiedApp) adapter.getItem(i); - currentView = adapter.getView(i, parentView, viewGroup); - box = (CheckBox) currentView.findViewById(R.id.itemcheck); - - if (this.status == 0){ - app.setTorified(true); - }else if (this.status == 1){ - app.setTorified(false); - }else { - app.setTorified(!app.isTorified()); - } - - if (box != null) - box.setChecked(app.isTorified()); - - } - saveAppSettings(context); - loadApps(prefs); - } - }**/ - + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == android.R.id.home) + { + finish(); + return true; + } + return super.onOptionsItemSelected(item); + } @Override protected void onResume() { super.onResume(); - listApps = (GridView)findViewById(R.id.applistview); - + listApps = (GridView) findViewById(R.id.applistview); mPrefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - loadApps(mPrefs); + + + new AsyncTask<Void, Void, Void>() { + private ProgressDialog dialog; + + protected void onPreExecute() { + // Pre Code + dialog = new ProgressDialog(AppManagerActivity.this); + dialog.show(); + } + protected Void doInBackground(Void... unused) { + loadApps(mPrefs); + return null; + } + protected void onPostExecute(Void unused) { + listApps.setAdapter(adapterApps); + dialog.cancel(); + } + }.execute(); + + } SharedPreferences mPrefs = null; @@ -147,19 +105,17 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList { mApps = getApps(getApplicationContext(), prefs); - - /* - Arrays.sort(apps, new Comparator<TorifiedApp>() { + Collections.sort(mApps,new Comparator<TorifiedApp>() { public int compare(TorifiedApp o1, TorifiedApp o2) { if (o1.isTorified() == o2.isTorified()) return o1.getName().compareTo(o2.getName()); if (o1.isTorified()) return -1; return 1; } - });*/ + }); final LayoutInflater inflater = getLayoutInflater(); - ListAdapter adapter = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext,mApps) { + adapterApps = new ArrayAdapter<TorifiedApp>(this, R.layout.layout_apps_item, R.id.itemtext,mApps) { public View getView(int position, View convertView, ViewGroup parent) { @@ -189,7 +145,7 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList try { entry.icon.setImageDrawable(pMgr.getApplicationIcon(app.getPackageName())); - entry.icon.setOnClickListener(AppManager.this); + entry.icon.setOnClickListener(AppManagerActivity.this); if (entry.box != null) entry.icon.setTag(entry.box); @@ -202,7 +158,7 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList if (entry.text != null) { entry.text.setText(app.getName()); - entry.text.setOnClickListener(AppManager.this); + entry.text.setOnClickListener(AppManagerActivity.this); if (entry.box != null) entry.text.setTag(entry.box); @@ -210,7 +166,7 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList if (entry.box != null) { - entry.box.setOnCheckedChangeListener(AppManager.this); + entry.box.setOnCheckedChangeListener(AppManagerActivity.this); entry.box.setTag(app); entry.box.setChecked(app.isTorified()); @@ -220,7 +176,6 @@ public class AppManager extends AppCompatActivity implements OnCheckedChangeList } }; - listApps.setAdapter(adapter); } diff --git a/app/src/minimalperm/AndroidManifest.xml b/app/src/minimalperm/AndroidManifest.xml index d21aa11a..adf74209 100644 --- a/app/src/minimalperm/AndroidManifest.xml +++ b/app/src/minimalperm/AndroidManifest.xml @@ -76,7 +76,7 @@ android:name=".settings.SettingsPreferences" android:label="@string/app_name" /> <activity - android:name=".ui.AppManager" + android:name=".ui.AppManagerActivity" android:label="@string/app_name" android:theme="@style/Theme.AppCompat" />

1 0

[orbot/master] Merge branch 'isolateDest' of https://github.com/SpotComms/orbot into SpotComms-isolateDest
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit 8bbf0ba7995f1dbbb550624512aed086c96b11e0 Merge: 750a282e 18dd53d4 Author: n8fr8 <nathan(a)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>

1 0

[orbot/master] for issue #85
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit d94657d1f4b80bde24010eb7068cc3e8b9a42fb9 Author: Akshat Agrawal <akshatagrawal58(a)gmail.com> Date: Thu Sep 14 19:27:32 2017 +0530 for issue #85 please add this in Build --- BUILD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/BUILD b/BUILD index b122a9f9..073fc06b 100644 --- a/BUILD +++ b/BUILD @@ -16,6 +16,10 @@ Please install the following prerequisites (instructions for each follows): http://developer.android.com/sdk/ndk/index.html Android Software Dev Kit or SDK (for Java code): http://developer.android.com/sdk/index.html + AutoMake and AutoConf tool + sudo apt-get install autotools-dev + sudo apt-get install automake + sudo apt-gen install autogen autoconf libtool You will need to run the 'android' command in the SDK to install the necessary Android platform supports (ICS 4.x or android-15)

1 0

[orbot/master] Don't strip binaries when doing a debug build.
by n8fr8＠torproject.org 31 Oct '17

31 Oct '17

commit d591cdb0df2b1d4689579bc10de25af4df550e55 Author: Alexander Færøy <ahf(a)torproject.org> Date: Sun Oct 29 22:56:52 2017 -0400 Don't strip binaries when doing a debug build. This patch allows the developer to build the external binaries with DEBUG=1 which ensures that the final binaries are not stripped from any debug symbols. This makes the binaries useful together with Google's simpleperf profiler for Android. --- external/Makefile | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/external/Makefile b/external/Makefile index ea62aa95..3d05250b 100644 --- a/external/Makefile +++ b/external/Makefile @@ -11,6 +11,11 @@ export ac_cv_func_setpgrp_void=yes EXTERNAL_ROOT := $(shell pwd) +DEBUG ?= 0 + +# No-op command. +NOOP = true + # Android now has 64-bit and 32-bit versions of the NDK for GNU/Linux. We # assume that the build platform uses the appropriate version, otherwise the # user building this will have to manually set NDK_PROCESSOR or NDK_TOOLCHAIN. @@ -71,8 +76,12 @@ CPP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-cpp --sysroot=$(NDK_SYSROOT) LD := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ld AR := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ar RANLIB := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-ranlib -STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip \ - --strip-unneeded -R .note -R .comment --strip-debug + +ifeq ($(DEBUG), 1) + STRIP := $(NOOP) +else + STRIP := $(NDK_TOOLCHAIN_BASE)/bin/$(HOST)-strip --strip-unneeded -R .note -R .comment --strip-debug +endif CFLAGS = -DANDROID $(TARGET_CFLAGS) $(PIEFLAGS)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
201
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2017