diff --git a/briar-android/assets/tor b/briar-android/assets/tor index 298053a8611da57bdb25f66854de0fd6b57f438d..c3b7801b22c3d5b77b2ba3475fb63316f39101b4 100644 Binary files a/briar-android/assets/tor and b/briar-android/assets/tor differ diff --git a/briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java b/briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java index e768252956712924b1d6a8f97b8ad00c9fa77b7e..706c0e13a28647295a3922c56885ccf7cc9d3c48 100644 --- a/briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java +++ b/briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java @@ -187,9 +187,16 @@ class TorPlugin implements DuplexPlugin, EventHandler { // Create a shutdown hook to ensure the Tor process is killed shutdownManager.addShutdownHook(new Runnable() { public void run() { - if(LOG.isLoggable(INFO)) LOG.info("Killing Tor"); - if(tor != null) tor.destroy(); - if(pid != -1) android.os.Process.killProcess(pid); + if(tor != null) { + if(LOG.isLoggable(INFO)) + LOG.info("Killing Tor via destroy()"); + tor.destroy(); + } + if(pid != -1) { + if(LOG.isLoggable(INFO)) + LOG.info("Killing Tor via killProcess(" + pid + ")"); + android.os.Process.killProcess(pid); + } } }); // Open a control connection and authenticate using the cookie file