Merge pull request thaliproject#142 from sisbell/bug-32501a

Bug 32501: Add hasDormantCanceledByStartup to TOPL TorSettings Interface

Author: yaronyg

universal/src/main/java/com/msopentech/thali/toronionproxy/DefaultSettings.java

@@ -128,6 +128,11 @@ public boolean hasDebugLogs() {
         return false;
     }
 
+    @Override
+    public boolean hasDormantCanceledByStartup() {
+        return false;
+    }
+
     @Override
     public boolean hasIsolationAddressFlagForTunnel() {
         return false;

universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java

@@ -197,6 +197,19 @@ public TorConfigBuilder dontUseBridges() {
         return this;
     }
 
+    public TorConfigBuilder dormantCanceledByStartup() {
+        buffer.append("DormantCanceledByStartup 1\n");
+        return this;
+    }
+
+    @SettingsConfig
+    public TorConfigBuilder dormantCanceledByStartupFromSettings() {
+        if (settings.hasDormantCanceledByStartup()) {
+            dormantCanceledByStartup();
+        }
+        return this;
+    }
+
     public TorConfigBuilder entryNodes(String entryNodes) {
         if (!isNullOrEmpty(entryNodes))
             buffer.append("EntryNodes ").append(entryNodes).append('\n');

universal/src/main/java/com/msopentech/thali/toronionproxy/TorSettings.java

@@ -54,6 +54,8 @@ public interface TorSettings {
 
     boolean hasDebugLogs();
 
+    boolean hasDormantCanceledByStartup();
+
     boolean hasIsolationAddressFlagForTunnel();
 
     boolean hasOpenProxyOnAllInterfaces();