Commit cacbea71 authored by juga  's avatar juga
Browse files

Merge branch 'bug28646'

parents 2bcdef17 506a3f12
......@@ -19,6 +19,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
......
......@@ -204,6 +204,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'),
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment