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

[meek/master] Quick README on Chrome helper.
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit 14f8d365ed12823bb6fd890dc71850ce8d93d92c Author: David Fifield <david(a)bamsoftware.com> Date: Tue Apr 15 21:17:14 2014 -0700 Quick README on Chrome helper. --- chrome/README | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/chrome/README b/chrome/README new file mode 100644 index 0000000..940e555 --- /dev/null +++ b/chrome/README @@ -0,0 +1,15 @@ +meek helper extension for Chrome. + +To use, you must disable SPDY in Chrome by running it like this: + chrome --use-spdy=off +Start Chrome, then enter the Tools→Extensions screen. Click the "Load +unpacked extension" button and add the directory "app" in this +directory. Click the button again and add the directory "extension". +(You need to add both the app and the extension.) + +If the text under meek-browser-app reads "Inspect views: background page +(Inactive)", click the link in order to make it active. The extension +will be listening on localhost port 7000. Start tor with a torrc line +like this: + +ClientTransportPlugin meek exec ./meek-client --url=https://meek-reflect.appspot.com/ --front=www.google.com --log meek-client.log --helper 127.0.0.1:7000

1 0

[meek/master] Avoid hardcoded extension ID.
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit f3361a55c543a89441824fe55304d4d2e60ebcbb Author: Chang Lan <clan(a)eecs.berkeley.edu> Date: Tue Apr 15 20:04:18 2014 -0700 Avoid hardcoded extension ID. The Extension send heartbeat information containing its extension ID to the App periodically. --- chrome/app/background.js | 14 ++++++++++---- chrome/extension/background.js | 15 +++++++++++++-- chrome/extension/manifest.json | 1 + 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/chrome/app/background.js b/chrome/app/background.js index 1ce4d32..77ad0da 100644 --- a/chrome/app/background.js +++ b/chrome/app/background.js @@ -5,7 +5,6 @@ chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " const IP = "127.0.0.1"; const PORT = 7000; -const EXTENSION_ID = "epmfkpbifhkdhcedgfppmeeoonjenkee"; //FIXME: Hardcoded extension ID const STATE_READING_LENGTH = 1; const STATE_READING_OBJECT = 2; @@ -15,9 +14,16 @@ var state = STATE_READING_LENGTH; var buf = new Uint8Array(4); var bytesToRead = buf.length; -chrome.sockets.tcpServer.create({}, function(createInfo) { - listenAndAccept(createInfo.socketId); -}); +chrome.runtime.onMessageExternal.addListener( + function onHeartbeat(id, sender, sendResponse) { + console.assert(id === sender.id, "Sender's ID is incorrect."); + EXTENSION_ID = id; + chrome.runtime.onMessageExternal.removeListener(onHeartbeat); + chrome.sockets.tcpServer.create({}, function(createInfo) { + listenAndAccept(createInfo.socketId); + }); + } +); function listenAndAccept(socketId) { console.log("listenAndAccept " + socketId); diff --git a/chrome/extension/background.js b/chrome/extension/background.js index ecadac5..8acd9e8 100644 --- a/chrome/extension/background.js +++ b/chrome/extension/background.js @@ -1,7 +1,18 @@ // attempt to keep app from going inactive -chrome.alarms.create("ping", {when: 5000, periodInMinutes: 1 }); -chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " + alarm.name); }); +chrome.alarms.create("heartbeat", {when: 5000, periodInMinutes: 1 }); +chrome.alarms.onAlarm.addListener(function(alarm) { + chrome.management.getAll(function(extensions) { + var app_id; + for (var i = 0; i < extensions.length; i++) { + if (extensions[i].name === "meek-browser-app") { + app_id = extensions[i].id; + break; + } + } + chrome.runtime.sendMessage(app_id, chrome.runtime.id); + }); +}); var host = 'meek-reflect.appspot.com'; diff --git a/chrome/extension/manifest.json b/chrome/extension/manifest.json index 0e245db..c6bf6a3 100644 --- a/chrome/extension/manifest.json +++ b/chrome/extension/manifest.json @@ -7,6 +7,7 @@ "permissions": [ "notifications", "alarms", + "management", "webRequest", "webRequestBlocking", "<all_urls>"

1 0

[meek/chrome] Avoid hardcoded extension ID.
by dcf＠torproject.org 16 Apr '14

16 Apr '14

commit f3361a55c543a89441824fe55304d4d2e60ebcbb Author: Chang Lan <clan(a)eecs.berkeley.edu> Date: Tue Apr 15 20:04:18 2014 -0700 Avoid hardcoded extension ID. The Extension send heartbeat information containing its extension ID to the App periodically. --- chrome/app/background.js | 14 ++++++++++---- chrome/extension/background.js | 15 +++++++++++++-- chrome/extension/manifest.json | 1 + 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/chrome/app/background.js b/chrome/app/background.js index 1ce4d32..77ad0da 100644 --- a/chrome/app/background.js +++ b/chrome/app/background.js @@ -5,7 +5,6 @@ chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " const IP = "127.0.0.1"; const PORT = 7000; -const EXTENSION_ID = "epmfkpbifhkdhcedgfppmeeoonjenkee"; //FIXME: Hardcoded extension ID const STATE_READING_LENGTH = 1; const STATE_READING_OBJECT = 2; @@ -15,9 +14,16 @@ var state = STATE_READING_LENGTH; var buf = new Uint8Array(4); var bytesToRead = buf.length; -chrome.sockets.tcpServer.create({}, function(createInfo) { - listenAndAccept(createInfo.socketId); -}); +chrome.runtime.onMessageExternal.addListener( + function onHeartbeat(id, sender, sendResponse) { + console.assert(id === sender.id, "Sender's ID is incorrect."); + EXTENSION_ID = id; + chrome.runtime.onMessageExternal.removeListener(onHeartbeat); + chrome.sockets.tcpServer.create({}, function(createInfo) { + listenAndAccept(createInfo.socketId); + }); + } +); function listenAndAccept(socketId) { console.log("listenAndAccept " + socketId); diff --git a/chrome/extension/background.js b/chrome/extension/background.js index ecadac5..8acd9e8 100644 --- a/chrome/extension/background.js +++ b/chrome/extension/background.js @@ -1,7 +1,18 @@ // attempt to keep app from going inactive -chrome.alarms.create("ping", {when: 5000, periodInMinutes: 1 }); -chrome.alarms.onAlarm.addListener(function(alarm) { console.info("alarm name = " + alarm.name); }); +chrome.alarms.create("heartbeat", {when: 5000, periodInMinutes: 1 }); +chrome.alarms.onAlarm.addListener(function(alarm) { + chrome.management.getAll(function(extensions) { + var app_id; + for (var i = 0; i < extensions.length; i++) { + if (extensions[i].name === "meek-browser-app") { + app_id = extensions[i].id; + break; + } + } + chrome.runtime.sendMessage(app_id, chrome.runtime.id); + }); +}); var host = 'meek-reflect.appspot.com'; diff --git a/chrome/extension/manifest.json b/chrome/extension/manifest.json index 0e245db..c6bf6a3 100644 --- a/chrome/extension/manifest.json +++ b/chrome/extension/manifest.json @@ -7,6 +7,7 @@ "permissions": [ "notifications", "alarms", + "management", "webRequest", "webRequestBlocking", "<all_urls>"

1 0

[orbot/master] updated changelog for 13.0.6-RC-3
by n8fr8＠torproject.org 16 Apr '14

16 Apr '14

commit 1e8ae2a68d7d2d09d1b839df41e8fc5f354836ff Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 23:15:45 2014 -0400 updated changelog for 13.0.6-RC-3 --- CHANGELOG | 53 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 2cce598..81f0ab6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,59 @@ NOTE: Specific #s below correspond to Trac tickets logged and maintained at https://trac.torproject.org/projects/tor/ 13.0.6 +89fc2e6 updated to 13.0.6-RC-3 +b9eeb37 ensure Service has foreground priority so it is not killed (and improve onBind() calls to reset state if it is killed) +3824bc5 improving control port connection code adding additional logging for problems with Samsungs +fa6c101 bump version to 13.0.6-RC-2 +cc020f5 small tweaks to Tor binary startup code +16799ef add automapresolve to ensure .onion address are handled +06d5a6f improve process lookup code +cd8b7e4 connect to "localhost" instead of 127.0.0.1 +4673f04 update UI on rebind of service +c68ce2c fixes for transproxy to fix DNS leaks in some cases latest RC was leaking DNS due to updates iptables/xtables binary and need +915ff8a updated to 13.0.6-RC-1 +3413b34 fixes for getting process id of Tor process +e9d0fea updates resources and tx config for tagalog +10938ed update string resources from transifex +5326d2b updated string values for components +8d73be6 bump to 13.0.6-BETA-8 +af95098 remove "persistant" flag, as its only for system apps +831a52a improved logging and exit code reporting for transproxy +f853271 fix Service init/bind logic also remove updates for background drawing to save memory +8445f2e ensure appmgr doesn't fail on loading apps also don't load icons to improve memory usage +227253d updates to optimize resource memory usage +ed76f8b update to 13.0.6-BETA-7 +60a79a2 more updates to install clean-up process +f885059 fix problem with UI rotation and screen update +efb9a8c update to 13.0.6-BETA-6 +bf8a92c use AbsolutePath instead of Canonical; fix kill code +e1b1ca0 add constants for folder names +e8116f4 ensure existing files are deleted before upgrade +25f4ac8 adding new small icon +981123f update to 13.0.6-BETA-5 +b6a9b48 ensure existing binaries are removed before install problems may be caused by soft links or old bins +ef14ac5 fix large icon incorrect display in alert dialogs +bab67b7 small fixes for the wizard with new UI +3d1f391 updates for icons, backgrounds and improved drawing code to solve issues related to outofmemory +9d1311c updated to dark icon +b329920 update to BETA-4 for Permission changes +c9bf8d2 fix Shell calls so that we close() shell when done +e78486a update to support specific permissions for Service this is an attempted fix for Samsung S3/Note3 issues +7990644 update version to 13.0.6-BETA-3 +917ea6e fix for mikeperry transproxy leak bug find https://lists.torproject.org/pipermail/tor-talk/2014-March/032503.html +fc0554f fix for binary version upgrade support +4ed6ea1 updated pre-built binaries +7229c52 updated to openssl 1.0.1g +6bce7d5 fix ant build script and target +e5b70ba improve shell command, root and permissions handling +b734c6c add new library for superuser/shell commands +dda5633 updated to 13.0.6-BETA-1 +298f73c update Tor version code +75d3ecb update language wizard display to be more clear +fe44c29 add binaries (for non NDK developers) +05bf5b7 add/update translations from transifex +344e914 add transifex tx config +8140b32 a little bit of cleanup of new binary installs e25dc08 fixes the menus for appcompat library cc8d3e1 update to return to binaries as ZIPd res/raw stop using the libs/armeabi hack method b59bd1a remove binary apps/libs

1 0

[orbot/master] updated to 13.0.6-RC-3
by n8fr8＠torproject.org 16 Apr '14

16 Apr '14

commit 89fc2e6d5cfb546b04f916d5fbdda8cc128924b8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 22:59:01 2014 -0400 updated to 13.0.6-RC-3 --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 7902463..6a888bb 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="13.0.6-RC-2" - android:versionCode="80" + android:versionName="13.0.6-RC-3" + android:versionCode="81" android:installLocation="auto" >

1 0

[orbot/master] ensure Service has foreground priority so it is not killed
by n8fr8＠torproject.org 16 Apr '14

16 Apr '14

commit b9eeb3711b68b255a0ca177979fcd9c6a54596a8 Author: Nathan Freitas <nathan(a)freitas.net> Date: Tue Apr 15 22:31:24 2014 -0400 ensure Service has foreground priority so it is not killed (and improve onBind() calls to reset state if it is killed) --- src/org/torproject/android/service/TorService.java | 86 ++++++++++++-------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/src/org/torproject/android/service/TorService.java b/src/org/torproject/android/service/TorService.java index 5298764..ecc5017 100644 --- a/src/org/torproject/android/service/TorService.java +++ b/src/org/torproject/android/service/TorService.java @@ -183,7 +183,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst @Override public boolean onUnbind(Intent intent) { - // logNotice( "onUnbind Called: " + intent.getAction()); + logNotice( "onUnbind Called: " + intent.getAction()); return super.onUnbind(intent); @@ -230,7 +230,6 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotifyBuilder.setContentText(notifyMsg); mNotifyBuilder.setSmallIcon(icon); - mNotifyBuilder.setOngoing(isOngoing); if (notifyId == ERROR_NOTIFY_ID) { @@ -239,11 +238,18 @@ public class TorService extends Service implements TorServiceConstants, TorConst mNotifyBuilder.setLights(Color.GREEN, 1000, 1000); } - - mNotificationManager.notify( - notifyId, + if (isOngoing) + { + startForeground(notifyId, mNotifyBuilder.getNotification()); - + + } + else + { + mNotificationManager.notify( + notifyId, + mNotifyBuilder.getNotification()); + } } @@ -271,43 +277,45 @@ public class TorService extends Service implements TorServiceConstants, TorConst */ public int onStartCommand(Intent intent, int flags, int startId) { - - appBinHome = getDir(DIRECTORY_TOR_BINARY,Application.MODE_PRIVATE); - appCacheHome = getDir(DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); - - IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); - registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); - - mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) + try { + initBinaries(); - boolean startOnBoot = getSharedPrefs(getApplicationContext()).getBoolean("pref_start_boot",false); - - if (startOnBoot) + + IntentFilter mNetworkStateFilter = new IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION); + registerReceiver(mNetworkStateReceiver , mNetworkStateFilter); + + mNotificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (intent != null && intent.getAction()!=null && intent.getAction().equals("onboot")) { - setTorProfile(PROFILE_ON); + + boolean startOnBoot = getSharedPrefs(getApplicationContext()).getBoolean("pref_start_boot",false); + + if (startOnBoot) + { + setTorProfile(PROFILE_ON); + } } - } - else if (intent == null) - { - try { - initBinaries(); - findExistingProc () ; + else if (intent == null) + { + findExistingProc () ; + - - } catch (Exception e) { - // TODO Auto-generated catch block - e.printStackTrace(); } - - + + + // We want this service to continue running until it is explicitly + // stopped, so return sticky. + return START_STICKY; + + } + catch (Exception e) + { + logException ("Error starting service",e); + return Service.START_REDELIVER_INTENT; } - - // We want this service to continue running until it is explicitly - // stopped, so return sticky. - return START_STICKY; } @@ -517,6 +525,13 @@ public class TorService extends Service implements TorServiceConstants, TorConst private void initBinaries () throws Exception { + + if (appBinHome == null) + appBinHome = getDir(DIRECTORY_TOR_BINARY,Application.MODE_PRIVATE); + + if (appCacheHome == null) + appCacheHome = getDir(DIRECTORY_TOR_DATA,Application.MODE_PRIVATE); + fileTor= new File(appBinHome, TOR_ASSET_KEY); filePrivoxy = new File(appBinHome, PRIVOXY_ASSET_KEY); @@ -1211,6 +1226,7 @@ public class TorService extends Service implements TorServiceConstants, TorConst { try { + initBinaries(); findExistingProc (); } catch (Exception e)

1 0

[tor/master] Make the sandbox code allow the writev() syscall.
by nickm＠torproject.org 16 Apr '14

16 Apr '14

commit 196895ed7ed1bd4c93c4c3cdd12893cfa4e4cc41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 10 15:08:28 2014 -0400 Make the sandbox code allow the writev() syscall. Tor doesn't use it directly, but the glibc backtrace-to-fd code does --- src/common/sandbox.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 5775289..0a7a129 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -119,6 +119,7 @@ static int filter_nopar_gen[] = { SCMP_SYS(stat), SCMP_SYS(uname), SCMP_SYS(write), + SCMP_SYS(writev), SCMP_SYS(exit_group), SCMP_SYS(exit),

1 0

[tor/master] changes file for 11465
by nickm＠torproject.org 16 Apr '14

16 Apr '14

commit bd83d0ed186c0bb2c8e3892e55ac2f55770d3ee7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 10 15:51:18 2014 -0400 changes file for 11465 --- changes/bug11465 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/changes/bug11465 b/changes/bug11465 new file mode 100644 index 0000000..2425299 --- /dev/null +++ b/changes/bug11465 @@ -0,0 +1,9 @@ + o Minor features: + - When the Linux syscall sandbox finds an illegal system call, it + now tries to log a stack trace before exiting. Resolves ticket + 11465. + + o Minor bugfixes: + - Using the Linux syscall sandbox no longer prevents stack-trace + logging on crashes or errors. Fixes part 11465; bugfix on + 0.2.5.1-alpha.

1 0

[tor/master] Log a backtrace when the sandbox finds a failure
by nickm＠torproject.org 16 Apr '14

16 Apr '14

commit cc9e86db61e2ffb6c54b09e8c41e8fdad50b3ef3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 10 15:44:52 2014 -0400 Log a backtrace when the sandbox finds a failure This involves some duplicate code between backtrace.c and sandbox.c, but I don't see a way around it: calling more functions would mean adding more steps to our call stack, and running clean_backtrace() against the wrong point on the stack. --- src/common/backtrace.c | 18 ++++++++++++++++-- src/common/backtrace.h | 6 ++++++ src/common/sandbox.c | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/src/common/backtrace.c b/src/common/backtrace.c index 239c657..3a073a8 100644 --- a/src/common/backtrace.c +++ b/src/common/backtrace.c @@ -5,7 +5,6 @@ #define _GNU_SOURCE 1 #include "orconfig.h" -#include "backtrace.h" #include "compat.h" #include "util.h" #include "torlog.h" @@ -31,6 +30,9 @@ #include <ucontext.h> #endif +#define EXPOSE_CLEAN_BACKTRACE +#include "backtrace.h" + #if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) #define USE_BACKTRACE @@ -59,7 +61,7 @@ static tor_mutex_t cb_buf_mutex; * onto the stack. Fortunately, we usually have the program counter in the * ucontext_t structure. */ -static void +void clean_backtrace(void **stack, int depth, const ucontext_t *ctx) { #ifdef PC_FROM_UCONTEXT @@ -165,6 +167,18 @@ install_bt_handler(void) rv = -1; } } + + { + /* Now, generate (but do not log) a backtrace. This ensures that + * libc has pre-loaded the symbols we need to dump things, so that later + * reads won't be denied by the sandbox code */ + char **symbols; + int depth = backtrace(cb_buf, MAX_DEPTH); + symbols = backtrace_symbols(cb_buf, depth); + if (symbols) + free(symbols); + } + return rv; } diff --git a/src/common/backtrace.h b/src/common/backtrace.h index 765436f..b1df281 100644 --- a/src/common/backtrace.h +++ b/src/common/backtrace.h @@ -4,9 +4,15 @@ #ifndef TOR_BACKTRACE_H #define TOR_BACKTRACE_H +#include "orconfig.h" + void log_backtrace(int severity, int domain, const char *msg); int configure_backtrace_handler(const char *tor_version); void clean_up_backtrace_handler(void); +#ifdef EXPOSE_CLEAN_BACKTRACE +void clean_backtrace(void **stack, int depth, const ucontext_t *ctx); +#endif + #endif diff --git a/src/common/sandbox.c b/src/common/sandbox.c index 0a7a129..0548f3e 100644 --- a/src/common/sandbox.c +++ b/src/common/sandbox.c @@ -56,6 +56,17 @@ #include <time.h> #include <poll.h> +#if defined(HAVE_EXECINFO_H) && defined(HAVE_BACKTRACE) && \ + defined(HAVE_BACKTRACE_SYMBOLS_FD) && defined(HAVE_SIGACTION) +#define USE_BACKTRACE +#define EXPOSE_CLEAN_BACKTRACE +#include "backtrace.h" +#endif + +#ifdef USE_BACKTRACE +#include <execinfo.h> +#endif + /**Determines if at least one sandbox is active.*/ static int sandbox_active = 0; /** Holds the parameter list configuration for the sandbox.*/ @@ -1308,6 +1319,11 @@ install_syscall_filter(sandbox_cfg_t* cfg) return (rc < 0 ? -rc : rc); } +#ifdef USE_BACKTRACE +#define MAX_DEPTH 256 +static void *syscall_cb_buf[MAX_DEPTH]; +#endif + /** * Function called when a SIGSYS is caught by the application. It notifies the * user that an error has occurred and either terminates or allows the @@ -1319,6 +1335,12 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) ucontext_t *ctx = (ucontext_t *) (void_context); char number[32]; int syscall; +#ifdef USE_BACKTRACE + int depth; + int n_fds, i; + const int *fds = NULL; +#endif + (void) nr; if (info->si_code != SYS_SECCOMP) @@ -1329,12 +1351,25 @@ sigsys_debugging(int nr, siginfo_t *info, void *void_context) syscall = (int) ctx->uc_mcontext.gregs[REG_SYSCALL]; +#ifdef USE_BACKTRACE + depth = backtrace(syscall_cb_buf, MAX_DEPTH); + /* Clean up the top stack frame so we get the real function + * name for the most recently failing function. */ + clean_backtrace(syscall_cb_buf, depth, ctx); +#endif + format_dec_number_sigsafe(syscall, number, sizeof(number)); tor_log_err_sigsafe("(Sandbox) Caught a bad syscall attempt (syscall ", number, ")\n", NULL); +#ifdef USE_BACKTRACE + n_fds = tor_log_get_sigsafe_err_fds(&fds); + for (i=0; i < n_fds; ++i) + backtrace_symbols_fd(syscall_cb_buf, depth, fds[i]); +#endif + #if defined(DEBUGGING_CLOSE) _exit(1); #endif // DEBUGGING_CLOSE

1 0

[tor/master] Merge remote-tracking branch 'public/bug11465'
by nickm＠torproject.org 16 Apr '14

16 Apr '14

commit 125c8e54680c936b9e532597372c62ac47af4fa9 Merge: 03e0c7e bd83d0e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 15 20:55:28 2014 -0400 Merge remote-tracking branch 'public/bug11465' changes/bug11465 | 9 +++++++++ src/common/backtrace.c | 18 ++++++++++++++++-- src/common/backtrace.h | 6 ++++++ src/common/sandbox.c | 36 ++++++++++++++++++++++++++++++++++++ 4 files changed, 67 insertions(+), 2 deletions(-)

1 0