summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-04-29 11:15:11 -0400
committerNick Mathewson <nickm@torproject.org>2011-04-29 11:15:11 -0400
commitc48d6da24c403f6a9f8240035e8c1114cdd2eb13 (patch)
tree60dc4f8294b8712b30e108348dbfc1bcf9e77b1e /src/or/config.c
parentdaede6f97bc892f7838c819f81f54654e10aebf8 (diff)
parentdbd73b9689e8008adc149472ca5c02692a49923d (diff)
downloadtor-c48d6da24c403f6a9f8240035e8c1114cdd2eb13.tar.gz
tor-c48d6da24c403f6a9f8240035e8c1114cdd2eb13.zip
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c
index a4d3e34d80..c868b09325 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3560,10 +3560,9 @@ options_validate(or_options_t *old_options, or_options_t *options,
}
if (options->CookieAuthFileGroupReadable && !options->CookieAuthFile) {
- log_warn(LD_CONFIG, "You set the CookieAuthFileGroupReadable but did "
- "not configure a the path for the cookie file via "
- "CookieAuthFile. This means your cookie will not be group "
- "readable.");
+ log_warn(LD_CONFIG, "CookieAuthFileGroupReadable is set, but will have "
+ "no effect: you must specify an explicit CookieAuthFile to "
+ "have it group-readable.");
}
if (options->UseEntryGuards && ! options->NumEntryGuards)