Don't daemonize Tor process

network/tor-local-network/src/main/java/bisq/tor/local_network/torrc/CommonTorrcGenerator.java

@@ -46,7 +46,6 @@ public Map<String, String> generate() {
         torConfigMap.put("TestingMinExitFlagThreshold", "0");
 
         torConfigMap.put("DataDirectory", thisTorNode.getDataDir().toAbsolutePath().toString());
-        torConfigMap.put("RunAsDaemon", "1");
 
         torConfigMap.put("Nickname", thisTorNode.getNickname());
         torConfigMap.put("ShutdownWaitLength", "2");

network/tor/src/main/java/bisq/tor/ClientTorrcGenerator.java

@@ -39,7 +39,6 @@ public ClientTorrcGenerator(Path dataDirPath, int controlPort, String hashedCont
 
     public Map<String, String> generate() {
         torConfigMap.put("DataDirectory", dataDirPath.toAbsolutePath().toString());
-        torConfigMap.put("RunAsDaemon", "1");
 
         torConfigMap.put("ControlPort", "127.0.0.1:" + controlPort);
         torConfigMap.put("HashedControlPassword", hashedControlPassword);

network/tor/src/main/java/bisq/tor/process/CouldNotWaitForTorShutdown.java

@@ -0,0 +1,28 @@
+/*
+ * This file is part of Bisq.
+ *
+ * Bisq is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or (at
+ * your option) any later version.
+ *
+ * Bisq is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Bisq. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package bisq.tor.process;
+
+public class CouldNotWaitForTorShutdown extends RuntimeException {
+    public CouldNotWaitForTorShutdown(String message) {
+        super(message);
+    }
+
+    public CouldNotWaitForTorShutdown(Throwable cause) {
+        super(cause);
+    }
+}

network/tor/src/main/java/bisq/tor/process/NativeTorProcess.java

@@ -28,6 +28,7 @@
 import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 @Slf4j
@@ -78,6 +79,19 @@ public void waitUntilControlPortReady() {
         }
     }
 
+    public void waitUntilExited() {
+        process.ifPresent(process -> {
+            try {
+                boolean isSuccess = process.waitFor(2, TimeUnit.MINUTES);
+                if (!isSuccess) {
+                    throw new CouldNotWaitForTorShutdown("Tor still running after 2 minutes timeout.");
+                }
+            } catch (InterruptedException e) {
+                throw new CouldNotWaitForTorShutdown(e);
+            }
+        });
+    }
+
     private Future<Path> createLogFileCreationWaiter() {
         Path dataDir = torrcPath.getParent();
         Path logFilePath = torrcPath.getParent().resolve("debug.log");