Merge remote-tracking branch 'tor-github/pr/1512'

This commit is contained in:
teor 2019-11-07 10:35:50 +10:00
commit 10982d5997
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A

View File

@ -711,9 +711,9 @@ static const config_var_t option_vars_[] = {
VAR_NODUMP("__HashedControlSessionPassword", LINELIST,
HashedControlSessionPassword,
NULL),
VAR_NODUMP_IMMUTABLE("__OwningControllerProcess",STRING,
VAR_NODUMP("__OwningControllerProcess",STRING,
OwningControllerProcess, NULL),
VAR_NODUMP("__OwningControllerFD", UINT64, OwningControllerFD,
VAR_NODUMP_IMMUTABLE("__OwningControllerFD", UINT64, OwningControllerFD,
UINT64_MAX_STRING),
V(MinUptimeHidServDirectoryV2, INTERVAL, "96 hours"),
V(TestingServerDownloadInitialDelay, CSV_INTERVAL, "0"),