May 2011 - tor-commits - lists.torproject.org

r24765: {website} new version of orbot available. (website/trunk/include)
by Andrew Lewman 17 May '11

17 May '11

Author: phobos Date: 2011-05-17 08:49:04 +0000 (Tue, 17 May 2011) New Revision: 24765 Modified: website/trunk/include/versions.wmi Log: new version of orbot available. Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-05-17 03:09:25 UTC (rev 24764) +++ website/trunk/include/versions.wmi 2011-05-17 08:49:04 UTC (rev 24765) @@ -49,8 +49,8 @@ <define-tag version-vidalia-stable whitespace=delete>0.2.12</define-tag> -<define-tag version-androidbundle-tor whitespace=delete>0.2.2.22-alpha</define-tag> -<define-tag version-androidbundle-orbot whitespace=delete>1.0.4.1</define-tag> +<define-tag version-androidbundle-tor whitespace=delete>0.2.2.25-alpha</define-tag> +<define-tag version-androidbundle-orbot whitespace=delete>1.0.5.2</define-tag> <define-tag version-androidbundle-privoxy whitespace=delete>privoxy-3.0.12-stable</define-tag> <define-tag version-androidbundle-libevent whitespace=delete>libevent-1.4.12-stable</define-tag> <define-tag package-androidbundle-alpha whitespace=delete>dist/android/<version-androidbundle-tor>-orbot-<version-androidbundle-orbot>.apk</define-tag>

1 0

[tor/release-0.2.2] add a trac entry number to bug, er, 3207
by arma＠torproject.org 17 May '11

17 May '11

commit bcd79f7f52b038772e32de08c12c65ab55f412db Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 17 01:50:53 2011 -0400 add a trac entry number to bug, er, 3207 --- ChangeLog | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09dc93e..b211ac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -73,7 +73,7 @@ Changes in version 0.2.2.26-beta - 2011-05-17 - As an authority, do not upload our own vote or signature set to ourself. It would tell us nothing new, and as of 0.2.2.24-alpha, it would get flagged as a duplicate. Resolves bug 3026. - - Accept hidden service descriptors if we think we are a hidden + - Accept hidden service descriptors if we think we might be a hidden service directory, regardless of what our consensus says. This helps robustness, since clients and hidden services can sometimes have a more up-to-date view of the network consensus than we do, @@ -117,7 +117,8 @@ Changes in version 0.2.2.26-beta - 2011-05-17 incorrect result. (Fortunately, we only used it for 16-bit values.) Fixes bug 3175; bugfix on 0.1.0.1-rc. - Require that introduction point keys and onion handshake keys - have public exponent 65537. Bugfix on 0.2.0.10-alpha. + have a public exponent of 65537. Starts to fix bug 3207; bugfix + on 0.2.0.10-alpha. o Removed features: - Caches no longer download and serve v2 networkstatus documents

1 0

r24764: {projects} updated manifest files with latest version info (projects/android/trunk/Orbot)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 03:09:25 +0000 (Tue, 17 May 2011) New Revision: 24764 Modified: projects/android/trunk/Orbot/AndroidManifest.xml projects/android/trunk/Orbot/AndroidManifest.xml.debug projects/android/trunk/Orbot/AndroidManifest.xml.production Log: updated manifest files with latest version info Modified: projects/android/trunk/Orbot/AndroidManifest.xml =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-17 03:09:12 UTC (rev 24763) +++ projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-17 03:09:25 UTC (rev 24764) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.1" android:versionCode="11"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.2" android:versionCode="14"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> Modified: projects/android/trunk/Orbot/AndroidManifest.xml.debug =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml.debug 2011-05-17 03:09:12 UTC (rev 24763) +++ projects/android/trunk/Orbot/AndroidManifest.xml.debug 2011-05-17 03:09:25 UTC (rev 24764) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug" android:versionCode="10"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a-dev-debug" + android:versionCode="13"> <uses-permission android:name="android.permission.INTERNET" /> Modified: projects/android/trunk/Orbot/AndroidManifest.xml.production =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-17 03:09:12 UTC (rev 24763) +++ projects/android/trunk/Orbot/AndroidManifest.xml.production 2011-05-17 03:09:25 UTC (rev 24764) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a" android:versionCode="11"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.20110503a" android:versionCode="13"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

r24763: {projects} fixed handling of 'EntryNodes' preference (in projects/android/trunk/Orbot/src/org/torproject/android: . service)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 03:09:12 +0000 (Tue, 17 May 2011) New Revision: 24763 Modified: projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java Log: fixed handling of 'EntryNodes' preference Modified: projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java 2011-05-17 03:08:30 UTC (rev 24762) +++ projects/android/trunk/Orbot/src/org/torproject/android/SettingsPreferences.java 2011-05-17 03:09:12 UTC (rev 24763) @@ -28,6 +28,9 @@ private boolean hasRoot = false; + + private final static int HIDDEN_SERVICE_PREF_IDX = 6; + protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -77,12 +80,11 @@ } - int hiddenGroupIdx = 6; - prefHiddenServices = ((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(0)); + prefHiddenServices = ((CheckBoxPreference)((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(0)); prefHiddenServices.setOnPreferenceClickListener(this); - ((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(1).setEnabled(prefHiddenServices.isChecked()); - ((PreferenceCategory)this.getPreferenceScreen().getPreference(hiddenGroupIdx)).getPreference(2).setEnabled(prefHiddenServices.isChecked()); + ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(1).setEnabled(prefHiddenServices.isChecked()); + ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(2).setEnabled(prefHiddenServices.isChecked()); }; @@ -113,8 +115,8 @@ else if (preference == prefHiddenServices) { - ((PreferenceCategory)this.getPreferenceScreen().getPreference(5)).getPreference(1).setEnabled(prefHiddenServices.isChecked()); - ((PreferenceCategory)this.getPreferenceScreen().getPreference(5)).getPreference(2).setEnabled(prefHiddenServices.isChecked()); + ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(1).setEnabled(prefHiddenServices.isChecked()); + ((PreferenceCategory)this.getPreferenceScreen().getPreference(HIDDEN_SERVICE_PREF_IDX)).getPreference(2).setEnabled(prefHiddenServices.isChecked()); } else Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-17 03:08:30 UTC (rev 24762) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-17 03:09:12 UTC (rev 24763) @@ -1137,18 +1137,12 @@ if (value == null || value.length() == 0) { resetBuffer.add(name); - /* - if (conn != null) - { - try { - conn.resetConf(Arrays.asList(new String[]{name})); - } catch (IOException e) { - Log.w(TAG, "Unable to reset conf",e); - } - }*/ + } else + { configBuffer.add(name + ' ' + value); + } return false; } @@ -1289,13 +1283,10 @@ boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false); - String entranceNodes = prefs.getString("pref_entrance_nodes", ""); - String exitNodes = prefs.getString("pref_exit_nodes", ""); - String excludeNodes = prefs.getString("pref_exclude_nodes", ""); + String entranceNodes = prefs.getString("pref_entrance_nodes", null); + String exitNodes = prefs.getString("pref_exit_nodes", null); + String excludeNodes = prefs.getString("pref_exclude_nodes", null); - - //boolean enableTransparentProxy = prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false); - if (currentStatus == STATUS_ON) { //reset iptables rules in active mode @@ -1310,10 +1301,10 @@ } } - mBinder.updateConfiguration("EntranceNodes", entranceNodes, false); + mBinder.updateConfiguration("EntryNodes", entranceNodes, false); mBinder.updateConfiguration("ExitNodes", exitNodes, false); mBinder.updateConfiguration("ExcludeNodes", excludeNodes, false); - mBinder.updateConfiguration("StrictExitNodes", enableStrictNodes ? "1" : "0", false); + mBinder.updateConfiguration("StrictNodes", enableStrictNodes ? "1" : "0", false); if (useBridges) {

1 0

r24762: {projects} updated changelog and res strings version num (in projects/android/trunk/Orbot: . res/layout res/values res/values-ar res/values-ca res/values-de res/values-es res/values-fa res/values-mk res/values-nb res/values-nl res/values-pl res/values-pt res/values-ru res/values-sv res/values-zh)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 03:08:30 +0000 (Tue, 17 May 2011) New Revision: 24762 Modified: projects/android/trunk/Orbot/CHANGELOG projects/android/trunk/Orbot/res/layout/layout_main.xml projects/android/trunk/Orbot/res/values-ar/strings.xml projects/android/trunk/Orbot/res/values-ca/strings.xml projects/android/trunk/Orbot/res/values-de/strings.xml projects/android/trunk/Orbot/res/values-es/strings.xml projects/android/trunk/Orbot/res/values-fa/strings.xml projects/android/trunk/Orbot/res/values-mk/strings.xml projects/android/trunk/Orbot/res/values-nb/strings.xml projects/android/trunk/Orbot/res/values-nl/strings.xml projects/android/trunk/Orbot/res/values-pl/strings.xml projects/android/trunk/Orbot/res/values-pt/strings.xml projects/android/trunk/Orbot/res/values-ru/strings.xml projects/android/trunk/Orbot/res/values-sv/strings.xml projects/android/trunk/Orbot/res/values-zh/strings.xml projects/android/trunk/Orbot/res/values/strings.xml Log: updated changelog and res strings version num Modified: projects/android/trunk/Orbot/CHANGELOG =================================================================== --- projects/android/trunk/Orbot/CHANGELOG 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/CHANGELOG 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,5 +1,9 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +1.0.5.1/.2 +- small updates to layout of main screen to fit smaller screens +- fixed preference setting of EntryNode torrc value + 1.0.5 - added exit node and "StrictExitNode" preference - fixed tor binary installation issue related to max resource size and compression Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -33,11 +33,17 @@ android:layout_toLeftOf="@+id/radioModeImage" android:textColor="#cccccc" /> </RelativeLayout> - + <RelativeLayout + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_gravity="center_vertical" + + > <ImageView android:id="@+id/imgStatus" - android:layout_margin="5dip" - android:layout_width="320dip" + android:layout_margin="15dip" + android:layout_width="fill_parent" android:layout_height="320dip" android:src="@drawable/toroff" android:layout_gravity="center_horizontal" @@ -45,15 +51,15 @@ <TextView android:id="@+id/lblStatus" android:text="@string/press_to_start" - android:layout_gravity="center_horizontal" + android:gravity="center_horizontal" android:textStyle="bold" - android:layout_width="wrap_content" - android:layout_height="30dip" + android:layout_width="fill_parent" + android:layout_height="60dip" android:textColor="#ffffff" + android:layout_below="@id/imgStatus" /> - + </RelativeLayout> - </LinearLayout> Modified: projects/android/trunk/Orbot/res/values/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ar/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-ar/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">اوربوت (Orbot)</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ca/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-ca/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-de/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-de/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-de/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-es/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-es/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-es/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-fa/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-fa/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">اوربات</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-mk/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-mk/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Орбот</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-nb/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nb/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-nb/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-nl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-nl/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-pl/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-pl/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-pt/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-pt/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-pt/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> <string name="secure_default_web_url">https://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-ru/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-ru/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-sv/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-sv/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-sv/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string> Modified: projects/android/trunk/Orbot/res/values-zh/strings.xml =================================================================== --- projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-05-17 02:09:44 UTC (rev 24761) +++ projects/android/trunk/Orbot/res/values-zh/strings.xml 2011-05-17 03:08:30 UTC (rev 24762) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string name="app_name">Orbot</string> - <string name="app_version">1.0.5</string> + <string name="app_version">1.0.5.2</string> <string name="internal_web_url">http://orbot/</string> <string name="default_web_url">http://check.torproject.org</string>

1 0

r24761: {} 1.0.5.1 release (in projects/android/tags: . 0.2.2.25-alpha-orbot-1.0.5.1)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 02:09:44 +0000 (Tue, 17 May 2011) New Revision: 24761 Added: projects/android/tags/0.2.2.25-alpha-orbot-1.0.5.1/ projects/android/tags/0.2.2.25-alpha-orbot-1.0.5.1/Orbot/ Removed: projects/android/tags/0.2.2.25-alpha-orbot-1.0.5.1/Orbot/ Log: 1.0.5.1 release

1 0

r24760: {projects} updated for 1.0.5.1 (small mods to layout and prefs) (projects/android/trunk/Orbot)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 02:08:39 +0000 (Tue, 17 May 2011) New Revision: 24760 Modified: projects/android/trunk/Orbot/AndroidManifest.xml Log: updated for 1.0.5.1 (small mods to layout and prefs) Modified: projects/android/trunk/Orbot/AndroidManifest.xml =================================================================== --- projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-17 02:03:07 UTC (rev 24759) +++ projects/android/trunk/Orbot/AndroidManifest.xml 2011-05-17 02:08:39 UTC (rev 24760) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5" android:versionCode="11"> + package="org.torproject.android" android:versionName="0.2.2.25-orbot-alpha-1.0.5.1" android:versionCode="11"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

1 0

r24759: {projects} tweaking layout for small screens (in projects/android/trunk/Orbot/res: layout layout-land)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 02:03:07 +0000 (Tue, 17 May 2011) New Revision: 24759 Modified: projects/android/trunk/Orbot/res/layout-land/layout_main.xml projects/android/trunk/Orbot/res/layout/layout_main.xml Log: tweaking layout for small screens Modified: projects/android/trunk/Orbot/res/layout/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 02:02:36 UTC (rev 24758) +++ projects/android/trunk/Orbot/res/layout/layout_main.xml 2011-05-17 02:03:07 UTC (rev 24759) @@ -12,11 +12,11 @@ android:layout_height="30dp" android:layout_gravity="center_horizontal" android:background="#A0909090"> - <ImageView android:id="@+id/radioModeImage" + <ImageView android:id="@+id/radioModeImage" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="3dip" - android:layout_marginRight="3dip" + android:layout_marginTop="3px" + android:layout_marginRight="3px" android:gravity="right" android:layout_toRightOf="@+id/radioModeLabel" android:layout_alignParentRight="true" @@ -26,46 +26,32 @@ <TextView android:id="@+id/radioModeText" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/powered_by" - android:layout_marginTop="9px" + android:text="powered by The Tor Project " + android:layout_marginTop="8px" android:layout_marginRight="0px" android:gravity="right" android:layout_toLeftOf="@+id/radioModeImage" - android:textColor="#333333" /> + android:textColor="#cccccc" /> </RelativeLayout> - <TableLayout android:id="@+id/mainLayout" - android:layout_gravity="center" - android:layout_height="wrap_content" - android:layout_width="wrap_content"> - <TableRow android:id="@+id/startRow"> - <TableLayout - android:layout_gravity="center" - android:layout_height="wrap_content" - android:layout_width="wrap_content"> - <TableRow> - <ImageView - android:id="@+id/imgStatus" - android:layout_marginTop="30dip" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/toroff"/> - </TableRow> - <TableRow> - <TextView android:id="@+id/lblStatus" - android:text="@string/press_to_start" - android:layout_gravity="center_horizontal" - android:gravity="center_horizontal" - android:textStyle="bold" - android:layout_width="fill_parent" - android:layout_height="75px" - android:textColor="#ffffff" - /> - </TableRow> - </TableLayout> - </TableRow> - - </TableLayout> + <ImageView + android:id="@+id/imgStatus" + android:layout_margin="5dip" + android:layout_width="320dip" + android:layout_height="320dip" + android:src="@drawable/toroff" + android:layout_gravity="center_horizontal" + /> + + <TextView android:id="@+id/lblStatus" + android:text="@string/press_to_start" + android:layout_gravity="center_horizontal" + android:textStyle="bold" + android:layout_width="wrap_content" + android:layout_height="30dip" + android:textColor="#ffffff" + /> + Modified: projects/android/trunk/Orbot/res/layout-land/layout_main.xml =================================================================== --- projects/android/trunk/Orbot/res/layout-land/layout_main.xml 2011-05-17 02:02:36 UTC (rev 24758) +++ projects/android/trunk/Orbot/res/layout-land/layout_main.xml 2011-05-17 02:03:07 UTC (rev 24759) @@ -31,46 +31,26 @@ android:layout_toLeftOf="@+id/radioModeImage" android:textColor="#cccccc" /> </RelativeLayout> - - <ScrollView android:id="@+id/mainview" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <TableLayout android:id="@+id/mainLayout" - android:layout_gravity="center" - android:layout_height="wrap_content" - android:layout_width="wrap_content"> - <TableRow android:id="@+id/startRow"> - <TableLayout - android:layout_gravity="center" - android:layout_height="wrap_content" - android:layout_width="wrap_content"> - <TableRow> - <ImageView - android:id="@+id/imgStatus" - android:layout_width="wrap_content" - android:layout_height="225px" - android:src="@drawable/toroff"/> - </TableRow> - <TableRow> - <TextView android:id="@+id/lblStatus" - android:text="- Press to enable - " - android:layout_gravity="center_horizontal" - android:gravity="center_horizontal" - android:textStyle="bold" - android:width="320px" - android:height="100px" - android:textColor="#ffffff" - /> - </TableRow> - </TableLayout> - </TableRow> - - </TableLayout> - </ScrollView> + + <ImageView + android:id="@+id/imgStatus" + android:layout_width="fill_parent" + android:layout_margin="5dip" + android:layout_height="fill_parent" + android:layout_gravity="center_horizontal" + android:src="@drawable/toroff"/> + + + <TextView android:id="@+id/lblStatus" + android:text="@string/press_to_start" + android:layout_gravity="center_horizontal" + android:textStyle="bold" + android:layout_width="wrap_content" + android:layout_height="50dip" + android:textColor="#ffffff" + /> </LinearLayout> -

1 0

r24758: {projects} last modification for StrictNodes, exit node support (in projects/android/trunk/Orbot: res/xml src/org/torproject/android/service)
by Nathan Freitas 17 May '11

17 May '11

Author: n8fr8 Date: 2011-05-17 02:02:36 +0000 (Tue, 17 May 2011) New Revision: 24758 Modified: projects/android/trunk/Orbot/res/xml/preferences.xml projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java Log: last modification for StrictNodes, exit node support Modified: projects/android/trunk/Orbot/res/xml/preferences.xml =================================================================== --- projects/android/trunk/Orbot/res/xml/preferences.xml 2011-05-16 14:39:26 UTC (rev 24757) +++ projects/android/trunk/Orbot/res/xml/preferences.xml 2011-05-17 02:02:36 UTC (rev 24758) @@ -42,17 +42,26 @@ </PreferenceCategory> -<PreferenceCategory android:title="Exit Nodes"> - +<PreferenceCategory android:title="Node Configuration" android:summary="These are advanced settings that can reduce your anonymity"> +<EditTextPreference android:key="pref_entrance_nodes" +android:title="Entrance Nodes" +android:summary="Fingerprints, nicks, countries and addresses for the first hop" +android:dialogTitle="Enter Entrance Nodes" +/> <EditTextPreference android:key="pref_exit_nodes" android:title="Exit Nodes" -android:summary="Fingerprints, nicknames, country codes and address patterns for the last hop" +android:summary="Fingerprints, nicks, countries and addresses for the last hop" android:dialogTitle="Enter Exit Nodes" /> +<EditTextPreference android:key="pref_exclude_nodes" +android:title="Exclude Nodes" +android:summary="Fingerprints, nicks, countries and addresses to exclude" +android:dialogTitle="Enter Exclude Nodes" +/> <CheckBoxPreference android:defaultValue="false" -android:title="Strict Exit Nodes" android:key="pref_strict_exit_nodes" -android:summary="Use only these specific exit nodes"/> +android:title="Strict Nodes" android:key="pref_strict_nodes" +android:summary="Use *only* these specified nodes"/> </PreferenceCategory> <PreferenceCategory android:title="Bridges"> Modified: projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java =================================================================== --- projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-16 14:39:26 UTC (rev 24757) +++ projects/android/trunk/Orbot/src/org/torproject/android/service/TorService.java 2011-05-17 02:02:36 UTC (rev 24758) @@ -1288,8 +1288,10 @@ boolean enableHiddenServices = prefs.getBoolean("pref_hs_enable", false); - boolean enableStrictExitNodes = prefs.getBoolean("pref_strict_exit_nodes", false); + boolean enableStrictNodes = prefs.getBoolean("pref_strict_nodes", false); + String entranceNodes = prefs.getString("pref_entrance_nodes", ""); String exitNodes = prefs.getString("pref_exit_nodes", ""); + String excludeNodes = prefs.getString("pref_exclude_nodes", ""); //boolean enableTransparentProxy = prefs.getBoolean(TorConstants.PREF_TRANSPARENT, false); @@ -1308,13 +1310,10 @@ } } - if (exitNodes.length() > 0) - { - - mBinder.updateConfiguration("ExitNodes", exitNodes, false); - mBinder.updateConfiguration("StrictExitNodes", enableStrictExitNodes ? "1" : "0", false); - - } + mBinder.updateConfiguration("EntranceNodes", entranceNodes, false); + mBinder.updateConfiguration("ExitNodes", exitNodes, false); + mBinder.updateConfiguration("ExcludeNodes", excludeNodes, false); + mBinder.updateConfiguration("StrictExitNodes", enableStrictNodes ? "1" : "0", false); if (useBridges) {

1 0

[tor/release-0.2.2] nickm wanted to call this one a beta, so a beta it is
by arma＠torproject.org 17 May '11

17 May '11

commit 68c364bbc34c02a96f95a08a21b032f349f80802 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon May 16 22:01:18 2011 -0400 nickm wanted to call this one a beta, so a beta it is because hey, if the new status tag breaks something, it's still an alpha after all. ;) --- ChangeLog | 2 +- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc688ad..09dc93e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.2.26-alpha - 2011-05-17 +Changes in version 0.2.2.26-beta - 2011-05-17 o Security/privacy fixes: - Replace all potentially sensitive memory comparison operations with versions whose runtime does not depend on the data being diff --git a/configure.in b/configure.in index 2eadd15..2fdec04 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.2.26-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.2.26-beta) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index fbc049b..13f48e9 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.2.26-alpha" +!define VERSION "0.2.2.26-beta" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 9b52bda..bce3488 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -233,5 +233,5 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.2.26-alpha" +#define VERSION "0.2.2.26-beta"

1 0