From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 5 Nov 2014 19:11:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'meejah/ticket-11291-extra-utests'
X-Git-Tag: tor-0.2.6.2-alpha~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4df419a4b19c3b4033b964ec73e82aa988034c81;p=thirdparty%2Ftor.git

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

Conflicts:
	src/or/config.c
---

4df419a4b19c3b4033b964ec73e82aa988034c81
diff --cc src/or/config.c
index d7c1c5c435,847ae162ed..ca56b6dcd1
--- 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),