nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/config/config.c
View File

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