diff options
| author | teor <teor@torproject.org> | 2019-11-07 10:35:50 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-07 10:35:50 +1000 |
| commit | 10982d59973a33da0d8a553b0d1ee6d1cb8d5a2c (patch) | |
| tree | 43c4fc72af480d9580a5f93d5f4deb09ac472836 | |
| parent | aebde73629d3df191beccd8afd794a8f05d3dfa5 (diff) | |
| parent | 1ee17dc07a4033546b5b4cfaedc3ace902ac8b20 (diff) | |
| download | tor-10982d59973a33da0d8a553b0d1ee6d1cb8d5a2c.tar.gz tor-10982d59973a33da0d8a553b0d1ee6d1cb8d5a2c.zip | |
Merge remote-tracking branch 'tor-github/pr/1512'
| -rw-r--r-- | src/app/config/config.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index 4a308a808f..e223011fcf 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -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"), |