commit 4df419a4b19c3b4033b964ec73e82aa988034c81 Merge: 3d8cb10 3d0d49b Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 5 14:11:47 2014 -0500

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

Conflicts: src/or/config.c

doc/tor.1.txt | 6 +++ src/common/util.c | 27 +++++++--- src/common/util.h | 4 +- src/or/config.c | 1 + src/or/or.h | 1 + src/or/rendservice.c | 46 ++++++++++++++-- src/test/Makefile.nmake | 4 +- src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_checkdir.c | 132 ++++++++++++++++++++++++++++++++++++++++++++++ 10 files changed, 211 insertions(+), 13 deletions(-)

diff --cc src/or/config.c index d7c1c5c,847ae16..ca56b6d --- a/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), + VAR("HiddenServiceDirGroupReadable", LINELIST_S, RendConfigLines, NULL), - OBSOLETE("HiddenServiceExcludeNodes"), - OBSOLETE("HiddenServiceNodes"), VAR("HiddenServiceOptions",LINELIST_V, RendConfigLines, NULL), VAR("HiddenServicePort", LINELIST_S, RendConfigLines, NULL), VAR("HiddenServiceVersion",LINELIST_S, RendConfigLines, NULL),