[tbb-commits] [tor-browser-build/maint-8.5] Bug 29045: Ensure that tor does not start up in dormant mode.

[gk at torproject.org]

commit 7818024b9c0af7b53623cf1dd4b493f8146ff9bb
Author: Kathy Brade <brade at pearlcrescent.com>
Date:   Wed Apr 10 11:26:29 2019 -0400

    Bug 29045: Ensure that tor does not start up in dormant mode.
    
    When operating as a client and there is no network activity for
    24 hours, tor 0.4.x will enter a dormant mode. Since most people
    who start Tor Browser expect to use it right way, and since
    bootstrapping won't occur when tor is dormant, we added the following
    to torrc-defaults to ensure that tor leaves dormant mode:
      DormantCanceledByStartup 1
---
 projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults          | 1 +
 projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults | 1 +
 projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults b/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults
index f383525..f3645cd 100644
--- a/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults
+++ b/projects/tor-browser/Bundle-Data/linux/Data/Tor/torrc-defaults
@@ -12,3 +12,4 @@ AvoidDiskWrites 1
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
 CookieAuthentication 1
+DormantCanceledByStartup 1
diff --git a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
index f383525..f3645cd 100644
--- a/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
+++ b/projects/tor-browser/Bundle-Data/mac/TorBrowser/Data/Tor/torrc-defaults
@@ -12,3 +12,4 @@ AvoidDiskWrites 1
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
 CookieAuthentication 1
+DormantCanceledByStartup 1
diff --git a/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults b/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults
index f383525..f3645cd 100644
--- a/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults
+++ b/projects/tor-browser/Bundle-Data/windows/Data/Tor/torrc-defaults
@@ -12,3 +12,4 @@ AvoidDiskWrites 1
 # (stderr|stdout|syslog|file FILENAME).
 Log notice stdout
 CookieAuthentication 1
+DormantCanceledByStartup 1