[tor-commits] [tor/maint-0.2.5] Some documentation fixes for #12864.

[nickm at torproject.org]

commit 112c984f9242699d273f3096d669eb1024d7f64b
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Aug 15 23:12:06 2014 +0300

    Some documentation fixes for #12864.
---
 doc/tor.1.txt   |    2 +-
 src/or/config.c |    3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 900e588..04d13fb 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -226,7 +226,7 @@ GENERAL OPTIONS
 
 [[ExtORPortCookieAuthFileGroupReadable]] **ExtORPortCookieAuthFileGroupReadable** **0**|**1**::
     If this option is set to 0, don't allow the filesystem group to read the
-    Extende OR Port cookie file. If the option is set to 1, make the cookie
+    Extended OR Port cookie file. If the option is set to 1, make the cookie
     file readable by the default GID. [Making the file readable by other
     groups is not yet implemented; let us know if you need this for some
     reason.] (Default: 0)
diff --git a/src/or/config.c b/src/or/config.c
index 20fde3b..f53186a 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -6825,6 +6825,9 @@ config_maybe_load_geoip_files_(const or_options_t *options,
  *  in <b>cookie_out</b>.
  *  Then write it down to <b>fname</b> and prepend it with <b>header</b>.
  *
+ *  If <b>group_readable</b> is set, set <b>fname</b> to be readable
+ *  by the default GID.
+ *
  *  If the whole procedure was successful, set
  *  <b>cookie_is_set_out</b> to True. */
 int