summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2014-08-21 22:17:23 -0400
committerRoger Dingledine <arma@torproject.org>2014-08-21 22:17:23 -0400
commitef89fd142cda9881728410710e5b75c30c1dcbb9 (patch)
treecee42450630f7edb625cc94819bd3482c97cd2f0
parentf8ca81c04fdc80b8d66692926f0da6abd0996790 (diff)
parentb159ffb675a274b285acc55204eaf6e83cd72bf8 (diff)
downloadtor-ef89fd142cda9881728410710e5b75c30c1dcbb9.tar.gz
tor-ef89fd142cda9881728410710e5b75c30c1dcbb9.zip
Merge branch 'maint-0.2.5' into release-0.2.5
-rw-r--r--src/or/config.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index f53186a5f9..6bb620937a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6871,6 +6871,8 @@ init_cookie_authentication(const char *fname, const char *header,
log_warn(LD_FS,"Unable to make %s group-readable.", escaped(fname));
}
}
+#else
+ (void) group_readable;
#endif
/* Success! */