commit 79d700700be2709621f8b3cd3aefcd6409822831 Author: juga0 juga@riseup.net Date: Mon Mar 1 09:04:27 2021 +0000

Revert "fix: stem: Remove torrc option that is the default"

This reverts commit 15da07d6a447d8310354124f6020b4cf74b75488. Because it's not the default. No additional changes are needed in the tests.

Closes #40064. --- docs/source/config_tor.rst | 1 + sbws/globals.py | 3 +++ 2 files changed, 4 insertions(+)

diff --git a/docs/source/config_tor.rst b/docs/source/config_tor.rst index b204ca2..e609468 100644 --- a/docs/source/config_tor.rst +++ b/docs/source/config_tor.rst @@ -9,6 +9,7 @@ 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 f5b3ec6..fa16096 100644 --- a/sbws/globals.py +++ b/sbws/globals.py @@ -22,6 +22,9 @@ 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