April 2014 - tor-commits - lists.torproject.org

[orbot/master] add new background graphics state change to main UI
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 4e1357bccae60e4f7c65c634803ef2c195659b65 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:37:20 2014 -0500 add new background graphics state change to main UI --- src/org/torproject/android/Orbot.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 5eb66fd..3ddf93c 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -68,6 +68,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick private TextView mTxtOrbotLog = null; private SlidingDrawer mDrawer = null; private boolean mDrawerOpen = false; + private View mViewMain = null; /* Some tracking bits */ private int torStatus = TorServiceConstants.STATUS_OFF; //latest status reported from the tor service @@ -95,6 +96,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick { setContentView(R.layout.layout_main); + mViewMain = findViewById(R.id.viewMain); lblStatus = (TextView)findViewById(R.id.lblStatus); lblStatus.setOnLongClickListener(this); imgStatus = (ImageProgressView)findViewById(R.id.imgStatus); @@ -718,6 +720,7 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick { imgStatus.setImageResource(R.drawable.toron); + mViewMain.setBackgroundResource(R.drawable.onionrootonly); // hideProgressDialog(); String lblMsg = getString(R.string.status_activated); @@ -760,7 +763,9 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick { imgStatus.setImageResource(R.drawable.torstarting); - + + mViewMain.setBackgroundResource(R.drawable.onionrootonlygold); + if (lblStatus != null && torServiceMsg != null) if (torServiceMsg.indexOf('%')!=-1) lblStatus.setText(torServiceMsg); @@ -776,7 +781,8 @@ public class Orbot extends SherlockActivity implements TorConstants, OnLongClick // hideProgressDialog(); - + mViewMain.setBackgroundResource(R.drawable.onionrootonlygrey); + imgStatus.setImageResource(R.drawable.toroff); lblStatus.setText(getString(R.string.status_disabled) + "\n" + getString(R.string.press_to_start));

1 0

[orbot/master] remove redundant iptables rules for transproxy
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 27d5945add2b9018952ed6185f4274109a58c28b Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:37:35 2014 -0500 remove redundant iptables rules for transproxy --- src/org/torproject/android/service/TorTransProxy.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/service/TorTransProxy.java b/src/org/torproject/android/service/TorTransProxy.java index 04400ac..7280eeb 100644 --- a/src/org/torproject/android/service/TorTransProxy.java +++ b/src/org/torproject/android/service/TorTransProxy.java @@ -302,7 +302,6 @@ public class TorTransProxy implements TorServiceConstants { if (tApp.isTorified() && (!tApp.getUsername().equals(TorServiceConstants.TOR_APP_USERNAME)) - && (!tApp.getUsername().equals(TorServiceConstants.ORWEB_APP_USERNAME)) ) //if app is set to true { @@ -528,7 +527,9 @@ public class TorTransProxy implements TorServiceConstants { script.append(ipTablesPath); script.append(" -t nat"); script.append(" -A ").append(srcChainName); - script.append(" -p udp -m owner ! --uid-owner "); + script.append(" -p udp"); + script.append(" ! -d 127.0.0.1"); //allow access to localhost + script.append(" -m owner ! --uid-owner "); script.append(torUid); script.append(" -m udp --dport "); script.append(STANDARD_DNS_PORT); @@ -536,6 +537,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(TOR_DNS_PORT); script.append(" || exit\n"); + /** int[] ports = {TOR_DNS_PORT,TOR_TRANSPROXY_PORT,PORT_SOCKS,PORT_HTTP}; for (int port : ports) @@ -553,7 +555,7 @@ public class TorTransProxy implements TorServiceConstants { script.append(" -j ACCEPT"); script.append(" || exit\n"); - } + }**/ // Allow loopback script.append(ipTablesPath);

1 0

[orbot/master] updating change log
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit ce5ef9572cf79402aec31f7918ee92f5b927d792 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Feb 22 19:28:57 2014 -0500 updating change log --- CHANGELOG | 147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index d7ada10..dda1e67 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,152 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +13.0.5 (includes v12 changes as well) +d605b45 add obfsclient build but don't include binary yet +0aa4294 add new obfsclient module +c1cb30d remove issue with service launching via explicit intent +87411be fix code for finding existing processes +16c5426 adding new bg images for next release +c3327d7 13.0.4a fix for Tor link setup +3b9d6c8 make sure Tor path link is cleanly setup and chmod'd +e55f724 bump to 13.0.4 +cac2a28 updated TorBinaryInstaller now just handles resources +f538930 fix xtables installation and permission setting more fixes for running from sdcard +43625f8 bump to 13.0.3 +c595963 solves problem with binaries being stored on external SDcard +649ca40 enable compiliation for all android not just armv7 +591161f updated to 13.0.2 +635e307 cleanup imports +db53c19 updated binary versions in strings +62a5da6 updated tor binary that works with armv5 and v7 +6927126 updated torrc without automap settings (not needed) +92d19e3 ensures binary permissions are set +14fab24 bump to 13.0.1 +39699e6 add new icons showing different status +d3c11be add geoip v6 file and support in TorService +e24ae6c update Makefile - try building with older toolchain +a60c614 change jtorctl path to github updated version +8c4f09e new binaries built with update Makefile +8527929 unregister receive and check for alternate library path +1fa568d peg to new repo and head with fix for empty element bug +8b8e51b remove double entry for jtorctrl +cf5e445 fixes #2848 newnym might call a null conn in service +069a9bf fixes #2847 use class name to start service +2735a59 update to 13.0.0; release candidate 1 +096144b adding in binaries for UI/Android devs without NDK All binaries can be built from source using Makefile in /external +f69c1aa updated jtorctrl build +0b024c9 Merge branch 'master' of https://github.com/eighthave/orbot into hans_build_patches +d54cf74 bump to 13.0.0-alpha-1 +276e6c3 remove old external openssl-static path +e0a7fbb check for both link and original path in process lookup +b48bbc1 updated AUTHORS for amoghbl1 +e9396b7 use new bundled xtables binary appropriately +ca28ade add patches for iptables/xtables building on Android +76b15dd adding new iptables/xtables build from source +8b65332 clean up of error notifications +8722db9 put threading of settings reload into TorService +d2006b2 remove static openssl android and replace with real openssl +0e6bb42 add new openssl +c4d8c97 stop button for notification bar +c80c5d4 improvements on notification code +5891fee service should be unbound when activity is destroyed also some other cleanup of unused code +867ff53 remove simple server source bundle +3069fb5 run Tor from link to keep compatibility with OrbotHelper class some apps use our OrbotHelper.java class and are expecting the +17f7d46 update menu, strings, icons for ChatSecure (from Gibberbot) +198974a update to build openssl latest +468076e set to 1.0.1e release +8666b1b updating tor to 0.2.4.20 +95461da adding back in jtorctrl jar file +f3cbb6e updating SDK and removing share intents +6e79596 updating to Android 18 / 4.4 +420dd1e adding geoip ipv4 db back in for now +1739473 more updates for moving binaries to libs/armeabi +5870a67 update for 0.2.4.20 constant +6a125a9 more removal of share service from core Orbot moving to a separate app +a0de736 change "network conn" preference to be more clear +c58f009 remove simple jar from project (moving sharing to sep app) +5286421 remove "ShareService" from projet (moving to separate app) +a8ca927 remove simple file sharing server from build process +fbd4fdc updated to android-18 +6b0b0fa more changes for executing binaries from libs/jni folder +d40016b move minimum device support to API 9 or 2.3 +d6d989a updated jar for jtor control +4d6e0cc update makefile for new install process update tags for libevent and tor +d236708 removing binaries from repo binaries will now be stored in /libs/armeabi as psuedo shared libraries (actually executables) and +ca8197f update native build to include Android NDK build flags +2d34745 include note about git submodules in BUILD instructions +ddd62f2 remove spaces and tabs where 'make' complains about them +f4e73e9 updating version to 12.0.5 +abe1788 another shared prefs fix +e632b3b fixes for sharing preferences across processes +9a10cdd updated orbot glow icon +a9b41a8 make orbot another background process +8f44c51 make sure binaries and config files are updated +e84ee71 added GUI support for flinging to a newnym identity +f12e556 added support for NEWNYM signalling +9dacb5b updated transproxy iptables rules to ensure clear/flush +965dab2 updated to 12.0.4 +4407257 adding raw design resources +5930964 new green/tor on mode +cea338d add new Root utility for checking if root is possible +82fcea0 fixes for superuser and iptables check code +9d6f3c8 removed unneeded old iptables binaries +38e2f49 12.0.3 0.2.4.16-rc +1bc97c6 change default "disable network" pref to true +a97432c update manifest to 12.0.2 +fb49463 update to latest tor 0.2.4.16-rc +5bcb607 update the readme copyright +3d387af add our new icon source CC license link +eb1c6b0 make the "check" button a bit smarter +9a2a989 updates to graphics, layouts and strings +2cfd6af update torctrl jar +79e6eec update tor to tor-0.2.4.16-rc +0a3cc50 add resources for airplane mode/network disable +2c278f3 fix for notifications and debug option for "airplane mode" +cdd75f3 disable share/send feature for this release +cfb0473 remove unneeded view and share intents +adc57ae removed android Debug code +d407f32 update Tor binary version number to ensure upgrade +5b57407 updated classpath for latest eclipse +bebb143 make Orbot just one process +21d1023 fixes for prefs/settings management +303ceb4 updates for building +edd855f new builds of binaries +42b111a updating commit peg for ndk8 fix +179ef6e updated git submodules to public https paths +1bf7bb0 updating version +74fed91 updated jtorctrl built library +515b8ce added new strings resources +bbf8d8a updating string resources from transifex +273e190 updating built binaries +4f9a502 updated Tor repo +86d8c16 updates for new UI and file sharing +8aaa8cb updated process to singletop; rev'd version +700121d add simple external module to ignore path +2ab32fc new preference value updates +b6e2507 UI and flow updates +442216f share service via http hidden service +667fa64 updated for settings return value +3ea016b updates for reading preference settings +c5627f4 cleaned up notification support and added Share service +25a895a updated tor binary version number +c4810d4 added new method for remote server interface for Share service +1576775 closed reader stream +83319c1 added message for when internet is down +63b31cd updated to android 17 target +eb3f95c updated params for tuning, including largeHeap=true +21c2797 support landscape layout and new Share intent +7df2acd cleanup of imports and unclosed streams +ba9b95a new landscape layout for tablets with log view +2b9007e updated to latest libevent and tor repos +fe591d6 updated to latest jar libs +225cd32 tuning of torrc to try to resolve bugs +aaa2ed5 updated built binary to 0.2.4.10-alpha +216a41d adding new HS/onion based file sharing service +1748cb4 added missing path to libevent include +fb0a0fa updated to 0.2.3.25 +8023d16 updated locale handling to stop flashing +e2bbe4c proper spelling of Farsi + 1.0.11 - Tor updated to 0.2.3.23-RC - ActionBarSherlock updated to latest release

1 0

[orbot/master] updated icon and main graphics
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 714af31a203fd0a819063745127e22df35688115 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:37:01 2014 -0500 updated icon and main graphics --- res/drawable-hdpi/ic_launcher.png | Bin 8751 -> 6094 bytes res/drawable-mdpi/ic_launcher.png | Bin 4389 -> 3102 bytes res/drawable-xhdpi/ic_launcher.png | Bin 14446 -> 9158 bytes res/drawable/toron.png | Bin 135414 -> 109520 bytes res/drawable/torstarting.png | Bin 77523 -> 68493 bytes res/layout-land/layout_main.xml | 9 ++++++--- res/layout/layout_main.xml | 17 +++++++++-------- 7 files changed, 15 insertions(+), 11 deletions(-) diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png index 05980b5..fce00b3 100644 Binary files a/res/drawable-hdpi/ic_launcher.png and b/res/drawable-hdpi/ic_launcher.png differ diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png index ae0180b..1a439a3 100644 Binary files a/res/drawable-mdpi/ic_launcher.png and b/res/drawable-mdpi/ic_launcher.png differ diff --git a/res/drawable-xhdpi/ic_launcher.png b/res/drawable-xhdpi/ic_launcher.png index 759a528..0bb0317 100644 Binary files a/res/drawable-xhdpi/ic_launcher.png and b/res/drawable-xhdpi/ic_launcher.png differ diff --git a/res/drawable/toron.png b/res/drawable/toron.png index 749c76d..9d338d8 100644 Binary files a/res/drawable/toron.png and b/res/drawable/toron.png differ diff --git a/res/drawable/torstarting.png b/res/drawable/torstarting.png index 7cbf9fe..a7aae1e 100644 Binary files a/res/drawable/torstarting.png and b/res/drawable/torstarting.png differ diff --git a/res/layout-land/layout_main.xml b/res/layout-land/layout_main.xml index 595495e..b424327 100644 --- a/res/layout-land/layout_main.xml +++ b/res/layout-land/layout_main.xml @@ -6,9 +6,10 @@ android:paddingTop="0sp"> +  <RelativeLayout android:layout_width="fill_parent" android:layout_height="fill_parent"> @@ -132,7 +133,7 @@ > <TextView android:id="@+id/trafficDown" - android:textColor="#FF00B627" + android:textColor="#ccff2a" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" @@ -144,7 +145,7 @@ /> <TextView android:id="@+id/trafficUp" - android:textColor="#FF00B627" + android:textColor="#ccff2a" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" @@ -166,6 +167,8 @@ android:textIsSelectable="true" android:layout_below="@+id/rowTrafficData" android:fontFamily="sans-serif-light" + android:background="#aa333333" + android:padding="3sp" /> </RelativeLayout> diff --git a/res/layout/layout_main.xml b/res/layout/layout_main.xml index 762e458..dc76b34 100644 --- a/res/layout/layout_main.xml +++ b/res/layout/layout_main.xml @@ -3,12 +3,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/viewMain" - + android:background="@drawable/onionrootonlygrey" android:paddingTop="0sp"> - +  <RelativeLayout android:id="@+id/layoutHeaderMain" android:layout_width="fill_parent" android:layout_height="30dp" @@ -55,13 +55,14 @@ android:gravity="center_horizontal" android:textStyle="bold" android:layout_width="fill_parent" - android:layout_height="50sp" + android:layout_height="40dp" android:layout_marginBottom="20dp" - android:layout_marginLeft="30dp" - android:layout_marginRight="30dp" + android:layout_marginLeft="60dp" + android:layout_marginRight="60dp" android:textColor="#ffffff" android:maxLines="2" android:fontFamily="sans-serif-light" + android:background="#dd333333" /> @@ -109,7 +110,7 @@ > <TextView android:id="@+id/trafficDown" - android:textColor="#FF00B627" + android:textColor="#ccff2a" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" @@ -120,7 +121,7 @@ /> <TextView android:id="@+id/trafficUp" - android:textColor="#FF00B627" + android:textColor="#ccff2a" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true"

1 0

[orbot/master] updated binaries built from "make -C external"
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit dc58c40b27b7f6d8691bf8f751743fb835f8bbc9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:36:44 2014 -0500 updated binaries built from "make -C external" --- libs/armeabi/libprivoxy.so | Bin 593132 -> 700376 bytes libs/armeabi/libtor.so | Bin 4637328 -> 4666632 bytes libs/jtorctl.jar | Bin 14742 -> 14742 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/armeabi/libprivoxy.so b/libs/armeabi/libprivoxy.so index 67ad3c7..3468cd5 100755 Binary files a/libs/armeabi/libprivoxy.so and b/libs/armeabi/libprivoxy.so differ diff --git a/libs/armeabi/libtor.so b/libs/armeabi/libtor.so index 72d9660..02678fc 100755 Binary files a/libs/armeabi/libtor.so and b/libs/armeabi/libtor.so differ diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar index 68327b2..3a47122 100755 Binary files a/libs/jtorctl.jar and b/libs/jtorctl.jar differ

1 0

[orbot/master] update external commit tags
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit 806fe40985f5a3f19ad672ed953cc2d5f9cad084 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:37:45 2014 -0500 update external commit tags --- external/obfsclient | 1 + external/tor | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/external/obfsclient b/external/obfsclient new file mode 160000 index 0000000..39e1dd2 --- /dev/null +++ b/external/obfsclient @@ -0,0 +1 @@ +Subproject commit 39e1dd27000b6aecb074c55afaafab58b86e933a diff --git a/external/tor b/external/tor index 3cb5c70..5059627 160000 --- a/external/tor +++ b/external/tor @@ -1 +1 @@ -Subproject commit 3cb5c70beec5bf46b9e70b1fc6287a1c1c7847ee +Subproject commit 505962724c05445fa0f0354e990e6cb60ef193e9

1 0

[orbot/master] add new graphics and icons
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit f322f6b2c8e49cb6b096a8b0ba1de8501e2dade4 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:37:58 2014 -0500 add new graphics and icons --- res/drawable-xxhdpi/ic_launcher.png | Bin 0 -> 18172 bytes res/drawable-xxxhdpi/ic_launcher.png | Bin 0 -> 28466 bytes res/drawable/onion.png | Bin 0 -> 93700 bytes res/drawable/onionrootonlygold.png | Bin 0 -> 132042 bytes res/drawable/onionrootonlygrey.png | Bin 0 -> 129862 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable-xxhdpi/ic_launcher.png b/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..2c37faf Binary files /dev/null and b/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/res/drawable-xxxhdpi/ic_launcher.png b/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..7512663 Binary files /dev/null and b/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/res/drawable/onion.png b/res/drawable/onion.png new file mode 100644 index 0000000..80e3f94 Binary files /dev/null and b/res/drawable/onion.png differ diff --git a/res/drawable/onionrootonlygold.png b/res/drawable/onionrootonlygold.png new file mode 100644 index 0000000..544aecb Binary files /dev/null and b/res/drawable/onionrootonlygold.png differ diff --git a/res/drawable/onionrootonlygrey.png b/res/drawable/onionrootonlygrey.png new file mode 100644 index 0000000..0524f9e Binary files /dev/null and b/res/drawable/onionrootonlygrey.png differ

1 0

[orbot/master] add hi-res icon for the web
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit a24eacd57ac30e47802a30449d607195a911b9d9 Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 3 10:38:11 2014 -0500 add hi-res icon for the web --- web_hi_res_512.png | Bin 0 -> 135611 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/web_hi_res_512.png b/web_hi_res_512.png new file mode 100644 index 0000000..4ee874e Binary files /dev/null and b/web_hi_res_512.png differ

1 0

[orbot/master] setting to 4.6 for compat
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit dab37b576e012cc820a0eb52fd9e7d466a1bf6cd Author: Nathan Freitas <nathan(a)freitas.net> Date: Mon Mar 24 14:45:13 2014 -0400 setting to 4.6 for compat --- external/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/external/Makefile b/external/Makefile index 1d893b7..875fa90 100644 --- a/external/Makefile +++ b/external/Makefile @@ -25,14 +25,14 @@ endif NDK_BASE ?= /opt/android-ndk NDK_PLATFORM_LEVEL ?= 5 NDK_ABI=arm -NDK_COMPILER_VERSION = 4.7 +NDK_COMPILER_VERSION = 4.6 NDK_SYSROOT=$(NDK_BASE)/platforms/android-$(NDK_PLATFORM_LEVEL)/arch-$(NDK_ABI) APP_ABI=armeabi # NDK platform level, aka APP_PLATFORM, is equivalent to minSdkVersion APP_PLATFORM := android-$(shell sed -n 's,.*android:minSdkVersion="$[0-9][0-9]*$".*,\1,p' \ $(EXTERNAL_ROOT)/../AndroidManifest.xml) NDK_SYSROOT=$(NDK_BASE)/platforms/$(APP_PLATFORM)/arch-$(NDK_ABI) -NDK_TOOLCHAIN_VERSION=4.7 +NDK_TOOLCHAIN_VERSION=4.6 NDK_UNAME := $(shell uname -s | tr '[A-Z]' '[a-z]') ifeq ($(NDK_ABI),x86) HOST = i686-linux-android

1 0

[orbot/master] updated Makefile to not build libevent TESTS
by n8fr8＠torproject.org 04 Apr '14

04 Apr '14

commit b5a043a6a03211cbe2b7c052a4a4b166908a1e47 Author: Nathan Freitas <nathan(a)freitas.net> Date: Wed Mar 26 11:33:58 2014 -0400 updated Makefile to not build libevent TESTS --- external/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/Makefile b/external/Makefile index 875fa90..93d279d 100644 --- a/external/Makefile +++ b/external/Makefile @@ -128,7 +128,7 @@ libevent/Makefile: --disable-shared libevent-build-stamp: libevent/Makefile - $(MAKE) -C libevent + $(MAKE) -C libevent all-am touch libevent-build-stamp libevent: openssl libevent-build-stamp

1 0