tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE

commit 10982d59973a33da0d8a553b0d1ee6d1cb8d5a2c
parent aebde73629d3df191beccd8afd794a8f05d3dfa5
Author: teor <teor@torproject.org>
Date:   Thu,  7 Nov 2019 10:35:50 +1000

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

Diffstat:
Msrc/app/config/config.c | 4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 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"),