[tor-commits] [orbot/master] make sure all tor daemons are fully killed

[n8fr8@xxxxxxxxxxxxxx]

commit d18e1bb6a5c68fa562712e9b89d0088f8e4b4ee7
Author: n8fr8 <nathan@xxxxxxxxxxxxxxxxxxxx>
Date:   Sat Dec 7 06:49:05 2019 -0500

    make sure all tor daemons are fully killed
---
 .../src/main/java/org/torproject/android/service/TorService.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/orbotservice/src/main/java/org/torproject/android/service/TorService.java b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
index 5e9e9168..ea807be4 100644
--- a/orbotservice/src/main/java/org/torproject/android/service/TorService.java
+++ b/orbotservice/src/main/java/org/torproject/android/service/TorService.java
@@ -467,6 +467,13 @@ public class TorService extends Service implements TorServiceConstants, OrbotCon
             conn = null;
         }
 
+        // if that fails, try again using native utils
+        try {
+            killProcess(fileTor, "-9"); // this is -HUP
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
     }
 
     private void requestTorRereadConfig() {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits