diff --git a/briar-android/src/org/briarproject/android/TestingActivity.java b/briar-android/src/org/briarproject/android/TestingActivity.java
index 076d29f0aa1ba5bcdf792854dbe567efb2d9ad28..4c2ad93ec9a20226cf83898100dcf319e4195c7c 100644
--- a/briar-android/src/org/briarproject/android/TestingActivity.java
+++ b/briar-android/src/org/briarproject/android/TestingActivity.java
@@ -322,11 +322,13 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
 		else btPluginStatus += "not running";
 		statusMap.put("Bluetooth plugin:", btPluginStatus);
 
+		// All log output from the current process
 		StringBuilder log = new StringBuilder();
 		try {
 			int pid = android.os.Process.myPid();
-			Pattern pattern = Pattern.compile("./[^(]+\\( *" + pid + "\\):.*");
-			Process process = Runtime.getRuntime().exec("logcat -d *:I");
+			Pattern pattern = Pattern.compile(".*\\( *" + pid + "\\).*");
+			Runtime runtime = Runtime.getRuntime();
+			Process process = runtime.exec("logcat -d -v time *:I");
 			Scanner scanner = new Scanner(process.getInputStream());
 			while(scanner.hasNextLine()) {
 				String line = scanner.nextLine();
@@ -341,6 +343,22 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
 		}
 		statusMap.put("Debugging log:", log.toString());
 
+		// TorPlugin log output for all processes
+		StringBuilder torLog = new StringBuilder();
+		try {
+			Runtime runtime = Runtime.getRuntime();
+			Process process = runtime.exec("logcat -d -v time -s TorPlugin");
+			Scanner scanner = new Scanner(process.getInputStream());
+			while(scanner.hasNextLine()) {
+				torLog.append(scanner.nextLine());
+				torLog.append('\n');
+			}
+			scanner.close();
+		} catch(IOException e) {
+			if(LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
+		}
+		statusMap.put("Tor debugging log:", torLog.toString());
+
 		return Collections.unmodifiableMap(statusMap);
 	}