Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 20:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Upgraded Tor to version 0.2.4.16-rc from Orbot version 12.0.5.

Browse Source
This commit is contained in:
akwizgran
2013-12-05 19:51:49 +00:00
parent d1e4631c55
commit 3b0d8ec477
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
briar-android/assets/tor
View File

Binary file not shown.

13
briar-android/src/net/sf/briar/plugins/tor/TorPlugin.java
View File

@@ -187,9 +187,16 @@ class TorPlugin implements DuplexPlugin, EventHandler {
// Create a shutdown hook to ensure the Tor process is killed // Create a shutdown hook to ensure the Tor process is killed
shutdownManager.addShutdownHook(new Runnable() { shutdownManager.addShutdownHook(new Runnable() {
public void run() { public void run() {
if(LOG.isLoggable(INFO)) LOG.info("Killing Tor"); if(tor != null) {
if(tor != null) tor.destroy(); if(LOG.isLoggable(INFO))
if(pid != -1) android.os.Process.killProcess(pid); 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 // Open a control connection and authenticate using the cookie file