[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1487'

[teor at torproject.org]

commit 655603c779b36f2418d0cf35c32bba55ed2ea714
Merge: b9269d6d0 14831ea0a
Author: teor <teor at torproject.org>
Date:   Tue Nov 5 14:26:23 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1487'
    
    Combine V_IMMUTABLE and FILENAME changes on PidFile.

 changes/ticket32339_relative |  4 ++++
 src/app/config/config.c      | 39 +++++++++++++++++----------------------
 2 files changed, 21 insertions(+), 22 deletions(-)

diff --cc src/app/config/config.c
index 0f0d9ac46,275ac9e76..4a308a808
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -386,9 -382,9 +386,9 @@@ static const config_var_t option_vars_[
    V(UnixSocksGroupWritable,    BOOL,     "0"),
    V(CookieAuthentication,        BOOL,     "0"),
    V(CookieAuthFileGroupReadable, BOOL,     "0"),
-   V(CookieAuthFile,              STRING,   NULL),
+   V(CookieAuthFile,              FILENAME, NULL),
    V(CountPrivateBandwidth,       BOOL,     "0"),
 -  VAR("DataDirectory",           FILENAME, DataDirectory_option, NULL),
 +  VAR_IMMUTABLE("DataDirectory", FILENAME, DataDirectory_option, NULL),
    V(DataDirectoryGroupReadable,  BOOL,     "0"),
    V(DisableOOSCheck,             BOOL,     "1"),
    V(DisableNetwork,              BOOL,     "0"),
@@@ -594,8 -590,8 +594,8 @@@
    V(PathsNeededToBuildCircuits,  DOUBLE,   "-1"),
    V(PerConnBWBurst,              MEMUNIT,  "0"),
    V(PerConnBWRate,               MEMUNIT,  "0"),
-   V_IMMUTABLE(PidFile,           STRING,   NULL),
 -  V(PidFile,                     FILENAME,   NULL),
 -  V(TestingTorNetwork,           BOOL,     "0"),
++  V_IMMUTABLE(PidFile,           FILENAME,   NULL),
 +  V_IMMUTABLE(TestingTorNetwork, BOOL,     "0"),
    V(TestingMinExitFlagThreshold, MEMUNIT,  "0"),
    V(TestingMinFastFlagThreshold, MEMUNIT,  "0"),