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

[tor-browser-bundle/maint-3.6] Update twisted version for proxy support.
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit 03a977f7be49ba0be35b76f3d663bd484a2a8681 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 09:01:01 2014 -0700 Update twisted version for proxy support. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 07cac6c..01a18ec 100755 --- a/gitian/versions +++ b/gitian/versions @@ -35,7 +35,7 @@ PYCRYPTO_VER=2.6.1 ARGPARSE_VER=1.2.1 PYYAML_VER=3.11 ZOPEINTERFACE_VER=4.0.5 -TWISTED_VER=13.1.0 +TWISTED_VER=13.2.0 M2CRYPTO_VER=0.21.1 PY2EXE_VER=0.6.9 SETUPTOOLS_VER=1.4

1 0

[stem/master] Interpreter's /info errored for relays without contact info
by atagar＠torproject.org 06 Jun '14

06 Jun '14

commit d81dafbdd9cf4baa8f7f53a78b8badf818af4667 Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jun 6 08:35:35 2014 -0700 Interpreter's /info errored for relays without contact info Issue caught by zoltan... >>> /info 74.3.165.39 Traceback (most recent call last): File "/usr/bin/tor-prompt", line 8, in <module> stem.interpreter.main() File "/usr/lib/python3.4/site-packages/stem/interpreter/__init__.py", line 116, in main response = interpreter.run_command(user_input) File "/usr/lib/python3.4/site-packages/stem/util/conf.py", line 276, in wrapped return func(*args, config = config, **kwargs) File "/usr/lib/python3.4/site-packages/stem/interpreter/commands.py", line 318, in run_command output = self.do_info(arg) File "/usr/lib/python3.4/site-packages/stem/interpreter/commands.py", line 229, in do_info contact = contact.replace(alias, '@') AttributeError: 'NoneType' object has no attribute 'replace' --- docs/change_log.rst | 4 ++++ stem/interpreter/commands.py | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 58fca66..6e9a13c 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -40,6 +40,10 @@ Unreleased The following are only available within Stem's `git repository <download.html>`_. + * **Interpreter** + + * The /info command errored for relays without contact information. + .. _version_1.2: Version 1.2 diff --git a/stem/interpreter/commands.py b/stem/interpreter/commands.py index 5473628..2679e4c 100644 --- a/stem/interpreter/commands.py +++ b/stem/interpreter/commands.py @@ -220,7 +220,7 @@ class ControlInterpretor(code.InteractiveConsole): lines.append(format('flags: ', *BOLD_OUTPUT) + ', '.join(ns_desc.flags)) lines.append(format('exit policy: ', *BOLD_OUTPUT) + exit_policy_label) - if server_desc: + if server_desc and server_desc.contact: contact = stem.util.str_tools._to_unicode(server_desc.contact) # clears up some highly common obscuring

1 0

[orbot/master] updated changelog
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit 70d779256bf1dc6b936c05887133e02811012250 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 5 12:20:54 2014 -0400 updated changelog --- CHANGELOG | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2050165..a4af818 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,41 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ +14.0.0 BETA-1 +2650fda update to 14.0.0-BETA-1 +476dc1a update binaries for 0.2.4.22 Tor +b6116b5 switch to 0.2.4.22 version of Tor for release +148e7eb remove deletion of polipo folder +352c23b updated binaries for OpenSSL 1.0.1h +7622d2c update constant for 1.0.1h and latest openssl vuln http://ccsinjection.lepidum.co.jp/blog/2014-06-05/CCS-Injection-en/index.h +d392439 fix bridge append value from qrcode scan +d6f5720 remove synchronized - not needed, and causing blocking +f52c22a Merge branch 'amoghbl1-issue_3014_wizard_workflow' +f6750e1 sometimes text can be null +fd47e70 fix control port connections with socket timeouts +36a6349 status should update whether there is msg or not +63b4304 Merge branch 'issue_3014_wizard_workflow' of https://github.com/amoghbl1/orbot-1 into amoghbl1-issue_3014_wizard_workflow +25f6499 Merge branch 'master' of github.com:n8fr8/orbot +e2e0d26 Merge branch 'hans_feature_desc' +c1f9296 new work on binding and service starting +e2e00cc removed largeheap value +13ef143 add app description to manifest to support p2p distribution +c111030 Merge pull request #1 from amoghbl1/issue_2374_story_maker +4759d9f implemented button click function for the story maker button, also url added in strings, change to liking at review +53e82b1 general cleanup, removed log.d's +6488e6a cleaned Permissions workflow, implemented override for back button +935fa91 cleaned LotsaText workflow, implemented override for back button +f29a494 cleaned ConfigureTransProxy workflow, implemented override for back button +ea384f9 cleaned ChooseLocaleWizardActivity workflow, implemented override for back button and added toast warning message string +ffcfce7 cleaned TipsAndTricks workflow +255623a added the story maker button to the tips wizard page, also added tip string to the strings file. +23c689c added icon for story maker button to be added to the hints and tips page +cfc8a99 updated to 14.0.0-ALPHA-4 +278997d simple notification of bridge settings via URL +17934e6 initial support for setting bridge through URL +96c0a54 add large heap and remote process settings back in +726cf0c work to stabilize Tor background service auto-restart tor binary process if killed by Android OS print out debug info related +11c31fa update the changelog + 14.0.0 (ALPHA-2) 583c758 updated to 14.0.0-ALPHA-3 90848b0 reduce memory usage of app and make single process

1 0

[orbot/master] amek sure wizard only is shown once on start (not twice!)
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit 707bca4dafa4bb12b01d5e94638939863fc2cbfc Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 08:56:32 2014 -0400 amek sure wizard only is shown once on start (not twice!) --- src/org/torproject/android/Orbot.java | 3 +-- src/org/torproject/android/wizard/TipsAndTricks.java | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 17b80b3..956171f 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -537,8 +537,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic @Override protected void onNewIntent(Intent intent) { - super.onNewIntent(intent); - + setIntent(intent); handleIntents(); } diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java index c6ee05b..222d950 100644 --- a/src/org/torproject/android/wizard/TipsAndTricks.java +++ b/src/org/torproject/android/wizard/TipsAndTricks.java @@ -200,7 +200,7 @@ public class TipsAndTricks extends Activity implements TorConstants { public void onClick(View v) { finish(); - startActivityForResult(new Intent(TipsAndTricks.this, Orbot.class), 1); + startActivity(new Intent(TipsAndTricks.this, Orbot.class)); } }); }

1 0

[orbot/master] remove unnecessary line
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit 93451865f846d52a1eedaf3b0499162dcefdbbdb Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 09:59:03 2014 -0400 remove unnecessary line --- src/org/torproject/android/Orbot.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/torproject/android/Orbot.java b/src/org/torproject/android/Orbot.java index 956171f..cd92d46 100644 --- a/src/org/torproject/android/Orbot.java +++ b/src/org/torproject/android/Orbot.java @@ -92,6 +92,7 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic /** Called when the activity is first created. */ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + TorServiceUtils.getSharedPrefs(getApplicationContext()).registerOnSharedPreferenceChangeListener(this); @@ -659,7 +660,6 @@ public class Orbot extends ActionBarActivity implements TorConstants, OnLongClic startWizard(); - //startActivityForResult(new Intent(getApplicationContext(), LotsaText.class), 1); }

1 0

[orbot/master] removing binaries from repo
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit 7abea23429647c0777b7f83d9f1a49719c305b85 Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 5 12:21:22 2014 -0400 removing binaries from repo --- libs/jtorctl.jar | Bin 14742 -> 0 bytes res/raw/obfsclient.mp3 | Bin 807052 -> 0 bytes res/raw/polipo.mp3 | Bin 123224 -> 0 bytes res/raw/tor.mp3 | Bin 1692280 -> 0 bytes res/raw/xtables.mp3 | Bin 152674 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/libs/jtorctl.jar b/libs/jtorctl.jar deleted file mode 100755 index ccfe773..0000000 Binary files a/libs/jtorctl.jar and /dev/null differ diff --git a/res/raw/obfsclient.mp3 b/res/raw/obfsclient.mp3 deleted file mode 100644 index b1a7b31..0000000 Binary files a/res/raw/obfsclient.mp3 and /dev/null differ diff --git a/res/raw/polipo.mp3 b/res/raw/polipo.mp3 deleted file mode 100644 index c2fef39..0000000 Binary files a/res/raw/polipo.mp3 and /dev/null differ diff --git a/res/raw/tor.mp3 b/res/raw/tor.mp3 deleted file mode 100644 index b7a9a5b..0000000 Binary files a/res/raw/tor.mp3 and /dev/null differ diff --git a/res/raw/xtables.mp3 b/res/raw/xtables.mp3 deleted file mode 100644 index e9127c1..0000000 Binary files a/res/raw/xtables.mp3 and /dev/null differ

1 0

[orbot/master] fix for missing libs folder
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit 0fddd80305af6271aa00e282acad707c8c689a9c Author: Nathan Freitas <nathan(a)freitas.net> Date: Thu Jun 5 15:03:25 2014 -0400 fix for missing libs folder --- libs/README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/README.md b/libs/README.md new file mode 100644 index 0000000..72f796a --- /dev/null +++ b/libs/README.md @@ -0,0 +1,3 @@ +Please build the necessary dependency jars from the external folder: + +make -c external

1 0

[orbot/master] fixes for tor setConf/control port
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit da3c95575a18048c86598b5bd629252713b3da1e Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 09:59:10 2014 -0400 fixes for tor setConf/control port fixes hidden service support manages socks port conflicts --- res/values/strings.xml | 4 + res/xml/preferences.xml | 8 ++ src/org/torproject/android/TorConstants.java | 2 + src/org/torproject/android/service/TorService.java | 83 ++++++++++++-------- 4 files changed, 66 insertions(+), 31 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index 5a97804..42937d4 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -257,4 +257,8 @@ <string name="network_connectivity_is_good_waking_tor_up_">Network connectivity is good. Waking Tor up...</string> <string name="updating_settings_in_tor_service">updating settings in Tor service</string> + <string name="pref_socks_title">Tor SOCKS</string> + <string name="pref_socks_summary">IP and Port that Tor offers its SOCKS proxy on (default: 9050)</string> + <string name="pref_socks_dialog">SOCKS Config (ip:port)</string> + </resources> diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 095a5d0..8f0778b 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -196,6 +196,14 @@ android:dialogTitle="@string/pref_proxy_password_dialog" </PreferenceCategory> <PreferenceCategory android:title="Debug"> + + <EditTextPreference android:key="pref_socks" +android:title="@string/pref_socks_title" +android:summary="@string/pref_socks_summary" +android:dialogTitle="@string/pref_socks_dialog" +android:defaultValue="auto" +/> + <CheckBoxPreference android:key="pref_enable_logging" android:defaultValue="false" diff --git a/src/org/torproject/android/TorConstants.java b/src/org/torproject/android/TorConstants.java index 79ea7e0..1a9fcdb 100644 --- a/src/org/torproject/android/TorConstants.java +++ b/src/org/torproject/android/TorConstants.java @@ -56,4 +56,6 @@ public interface TorConstants { public final static int MAX_LOG_LENGTH = 10000; + public final static String PREF_SOCKS = "pref_socks"; + } diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 81453f1..0bce507 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -71,6 +71,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst private TorControlConnection conn = null; private Socket torConnSocket = null; private int mLastProcessId = -1; + private int mSocksPort = 9050; private static final int NOTIFY_ID = 1; private static final int TRANSPROXY_NOTIFY_ID = 2; @@ -81,8 +82,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst private static final int MAX_START_TRIES = 3; - private LinkedHashMap<String,String> configBuffer = null; - private LinkedHashMap<String,String> resetBuffer = null; + private ArrayList<String> configBuffer = null; + private ArrayList<String> resetBuffer = null; // private String appHome; private File appBinHome; @@ -120,7 +121,8 @@ public class TorService extends Service implements TorServiceConstants, TorConst public void logMessage(String msg) { - if (ENABLE_DEBUG_LOG) + if (ENABLE_DEBUG_LOG) + { Log.d(TAG,msg); sendCallbackLogMessage(msg); @@ -154,8 +156,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst sendCallbackLogMessage (getString(R.string.found_existing_tor_process)); - processSettingsImpl(); - String state = conn.getInfo("dormant"); if (state != null && Integer.parseInt(state) == 0) currentStatus = STATUS_ON; @@ -892,9 +892,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst catch (Exception ce) { conn = null; - logNotice( "Error connecting to Tor local control port: " + ce.getLocalizedMessage()); + logNotice( "Error connecting to Tor local control port"); - Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); + //Log.d(TAG,"Attempt: Error connecting to control port: " + ce.getLocalizedMessage(),ce); } @@ -990,7 +990,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst * Returns the port number that the SOCKS proxy is running on */ public int getSOCKSPort() throws RemoteException { - return TorServiceConstants.PORT_SOCKS; + return mSocksPort; } @@ -1318,9 +1318,10 @@ public class TorService extends Service implements TorServiceConstants, TorConst } + public void processSettings () { - + /* Thread thread = new Thread() { @@ -1338,6 +1339,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst }; thread.start(); + */ } @@ -1394,25 +1396,31 @@ public class TorService extends Service implements TorServiceConstants, TorConst return null; } + private final static String RESET_STRING = "=\"\""; /** * Set configuration **/ public boolean updateConfiguration (String name, String value, boolean saveToDisk) { if (configBuffer == null) - configBuffer = new LinkedHashMap<String,String>(); + configBuffer = new ArrayList<String>(); if (resetBuffer == null) - resetBuffer = new LinkedHashMap<String,String>(); + resetBuffer = new ArrayList<String>(); if (value == null || value.length() == 0) { - resetBuffer.put(name,""); + resetBuffer.add(name + RESET_STRING); } else { - configBuffer.put(name,value); + StringBuffer sbConf = new StringBuffer(); + sbConf.append(name); + sbConf.append(' '); + sbConf.append(value); + + configBuffer.add(sbConf.toString()); } return false; @@ -1449,24 +1457,31 @@ public class TorService extends Service implements TorServiceConstants, TorConst if (resetBuffer != null && resetBuffer.size() > 0) { - conn.resetConf(resetBuffer.keySet()); + for (String value : configBuffer) + { + + logMessage("removing torrc conf: " + value); + + + } + + conn.resetConf(resetBuffer); resetBuffer = null; } if (configBuffer != null && configBuffer.size() > 0) { - for (String key : configBuffer.keySet()) - { - - String value = configBuffer.get(key); - - if (TorService.ENABLE_DEBUG_LOG) - logMessage("Setting conf: " + key + "=" + value); - - conn.setConf(key, value); - - } + for (String value : configBuffer) + { + + logMessage("Setting torrc conf: " + value); + + + } + + conn.setConf(configBuffer); + configBuffer = null; } @@ -1657,7 +1672,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst SharedPreferences prefs = TorServiceUtils.getSharedPrefs(getApplicationContext()); - enableSocks ("127.0.0.1",9050,false); + String socksConfig = prefs.getString(TorConstants.PREF_SOCKS, "auto"); + + enableSocks (socksConfig,false); boolean useBridges = prefs.getBoolean(TorConstants.PREF_BRIDGES_ENABLED, false); @@ -1859,7 +1876,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { logNotice("hidden services are enabled"); - mBinder.updateConfiguration("HiddenServiceDir",appCacheHome.getAbsolutePath(), false); + //mBinder.updateConfiguration("RendPostPeriod", "600 seconds", false); //possible feature to investigate String hsPorts = prefs.getString("pref_hs_ports",""); @@ -1872,15 +1889,19 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { - hsPortConfig = st.nextToken(); + hsPortConfig = st.nextToken().trim(); if (hsPortConfig.indexOf(":")==-1) //setup the port to localhost if not specifed { - hsPortConfig = hsPortConfig + " 0.0.0.0:" + hsPortConfig; + hsPortConfig = hsPortConfig + " 127.0.0.1:" + hsPortConfig; } logMessage("Adding hidden service on port: " + hsPortConfig); + //String hsDirPath = new File(appCacheHome,"hs" + hsPortConfig).getAbsolutePath(); + String hsDirPath = appCacheHome.getAbsolutePath(); + + mBinder.updateConfiguration("HiddenServiceDir",hsDirPath, false); mBinder.updateConfiguration("HiddenServicePort",hsPortConfig, false); hsPort = Integer.parseInt(hsPortConfig.split(" ")[0]); @@ -1905,9 +1926,9 @@ public class TorService extends Service implements TorServiceConstants, TorConst return true; } - private void enableSocks (String ip, int port, boolean safeSocks) throws RemoteException + private void enableSocks (String socks, boolean safeSocks) throws RemoteException { - mBinder.updateConfiguration("SOCKSPort", ip + ":" + port + "", false); + mBinder.updateConfiguration("SOCKSPort", socks, false); mBinder.updateConfiguration("SafeSocks", safeSocks ? "1" : "0", false); mBinder.updateConfiguration("TestSocks", "1", false); mBinder.updateConfiguration("WarnUnsafeSocks", "1", false);

1 0

[orbot/master] update 14.0.0-BETA-2
by n8fr8＠torproject.org 06 Jun '14

06 Jun '14

commit ccaec1ebd3ececc2c829d45efeeccd4a00534bf1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Fri Jun 6 09:59:48 2014 -0400 update 14.0.0-BETA-2 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index bc5cde2..227e733 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.0-BETA-1" - android:versionCode="94" + android:versionName="14.0.0-BETA-2" + android:versionCode="95" android:installLocation="auto" >

1 0

[tor-browser-bundle/maint-3.6] Update Firefox version.
by mikeperry＠torproject.org 06 Jun '14

06 Jun '14

commit 164e557856e759a984fedaa5e71cc0036f10db49 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Fri Jun 6 06:40:04 2014 -0700 Update Firefox version. --- gitian/versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/versions b/gitian/versions index 3031ba9..07cac6c 100755 --- a/gitian/versions +++ b/gitian/versions @@ -6,7 +6,7 @@ VERIFY_TAGS=1 FIREFOX_VERSION=24.6.0esr -TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build1 +TORBROWSER_TAG=tor-browser-${FIREFOX_VERSION}-3.x-1-build2 TOR_TAG=tor-0.2.4.22 TORLAUNCHER_TAG=0.2.5.5 TORBUTTON_TAG=1.6.10.0

1 0