[tor-commits] [sbws/maint-1.1] fix: stem: Remove torrc option that is the default

[juga at torproject.org]

commit 15da07d6a447d8310354124f6020b4cf74b75488
Author: juga0 <juga at riseup.net>
Date:   Thu Dec 17 14:37:58 2020 +0000

    fix: stem: Remove torrc option that is the default
    
    to avoid conflict when comparing the options that should be set and the
    ones are set, since the SocksPort will be differently in chutney.
---
 docs/source/config_tor.rst | 1 -
 sbws/globals.py            | 3 ---
 2 files changed, 4 deletions(-)

diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst
index e609468..b204ca2 100644
--- a/docs/source/config_tor.rst
+++ b/docs/source/config_tor.rst
@@ -9,7 +9,6 @@ connection to an existing Tor daemon.
 
 Default configuration:
 
-- ``SocksPort auto``: To proxy requests over Tor.
 - ``CookieAuthentication 1``: The easiest way to authenticate to Tor.
 - ``UseEntryGuards 0``: To avoid path bias warnings.
 - ``UseMicrodescriptors 0``: Because full server descriptors are needed.
diff --git a/sbws/globals.py b/sbws/globals.py
index 2e4481c..2434685 100644
--- a/sbws/globals.py
+++ b/sbws/globals.py
@@ -22,9 +22,6 @@ SPEC_VERSION = '1.5.0'
 # Options that are known at runtime (from configuration file) are added
 # in utils/stem.py launch_tor
 TORRC_STARTING_POINT = {
-    # We will find out via the ControlPort and not setting something static
-    # means a lower chance of conflict
-    'SocksPort': 'auto',
     # Easier than password authentication
     'CookieAuthentication': '1',
     # To avoid path bias warnings