Merge remote-tracking branch 'origin/maint-0.2.5'

src/or/config.c

@@ -6890,6 +6890,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! */