[tor-commits] [sbws/master] fix: stem: Move torrc option that does not depend on config

[juga at torproject.org]

commit 2d5a6b65704857b8abde4a867f0f6590c181325c
Author: juga0 <juga at riseup.net>
Date:   Thu Dec 17 14:40:36 2020 +0000

    fix: stem: Move torrc option that does not depend on config
    
    It seems we forgot this option when refactoring in #28738.
---
 sbws/globals.py   | 6 +++++-
 sbws/util/stem.py | 4 ----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbws/globals.py b/sbws/globals.py
index 2434685..f5b3ec6 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -40,7 +40,11 @@ TORRC_STARTING_POINT = {
     'FetchDirInfoEarly': '1',
     'FetchDirInfoExtraEarly': '1',
     # To make Tor keep fetching descriptors, even when idle.
-    'FetchUselessDescriptors': '1'
+    'FetchUselessDescriptors': '1',
+    # Things needed to make circuits fail a little faster. We get the
+    # circuit_timeout as a string instead of an int on purpose: stem only
+    # accepts strings.
+    'LearnCircuitBuildTimeout': '0',
 }
 # Options that need to be set at runtime.
 TORRC_RUNTIME_OPTIONS = {
diff --git a/sbws/util/stem.py b/sbws/util/stem.py
index 5835237..4e8f321 100644
--- a/sbws/util/stem.py
+++ b/sbws/util/stem.py
@@ -206,10 +206,6 @@ def launch_tor(conf):
             'NOTICE file {}'.format(os.path.join(conf.getpath('tor', 'log'),
                                                  'notice.log')),
         ],
-        # Things needed to make circuits fail a little faster. We get the
-        # circuit_timeout as a string instead of an int on purpose: stem only
-        # accepts strings.
-        'LearnCircuitBuildTimeout': '0',
         'CircuitBuildTimeout': conf['general']['circuit_timeout'],
     })