Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'

Conflicts:
	src/or/config.c

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/config.c
index d7c1c5c4351035e6f2bc579e4137f79917c7672f,847ae162ed72eb7fbe34d0c4153ed04d9115e5a0..ca56b6dcd1a5698a714fa4593a5a7b3909238477
--- 1/src/or/config.c
--- 2/src/or/config.c
+++ b/src/or/config.c
@@@ -262,6 -272,9 +262,7 @@@ static config_var_t option_vars_[] = 
    V(HashedControlPassword,       LINELIST, NULL),
    V(HidServDirectoryV2,          BOOL,     "1"),
    VAR("HiddenServiceDir",    LINELIST_S, RendConfigLines,    NULL),
 -  OBSOLETE("HiddenServiceExcludeNodes"),
 -  OBSOLETE("HiddenServiceNodes"),
+   VAR("HiddenServiceDirGroupReadable",  LINELIST_S, RendConfigLines, NULL),
    VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines,    NULL),
    VAR("HiddenServicePort",   LINELIST_S, RendConfigLines,    NULL),
    VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines,    NULL),

diff --cc src/or/or.h
Simple merge

diff --cc src/or/rendservice.c
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test.c
Simple merge