Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
The Tor Project
Network Health
sbws
Commits
506a3f12
Commit
506a3f12
authored
Dec 01, 2018
by
juga
Browse files
globals, stem: explain where torrc options are
Fixes bug
#28646
. Bugfix v0.4.0
parent
7bb7c738
Changes
2
Hide whitespace changes
Inline
Side-by-side
sbws/globals.py
View file @
506a3f12
...
...
@@ -10,6 +10,8 @@ SPEC_VERSION = '1.2.0'
# This is a dictionary of torrc options we always want to set when launching
# Tor and that do not depend on any runtime configuration
# 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
...
...
sbws/util/stem.py
View file @
506a3f12
...
...
@@ -125,6 +125,7 @@ def launch_tor(conf):
# Bare minimum things, more or less
torrc
=
copy
.
deepcopy
(
TORRC_STARTING_POINT
)
# Very important and/or common settings that we don't know until runtime
# The rest of the settings are in globals.py
torrc
.
update
({
'DataDirectory'
:
conf
.
getpath
(
'tor'
,
'datadir'
),
'PidFile'
:
conf
.
getpath
(
'tor'
,
'pid'
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment