[tor-commits] [tor/master] Document two functions.

nickm at torproject.org nickm at torproject.org
Mon Nov 5 02:51:56 UTC 2012


commit 9d71d97e9dc32789693df135c06574a16d1ebfea
Author: Linus Nordberg <linus at torproject.org>
Date:   Fri Oct 19 23:23:04 2012 +0200

    Document two functions.
---
 src/or/config.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/src/or/config.c b/src/or/config.c
index b83b6f7..b81f319 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -5564,6 +5564,10 @@ parse_outbound_addresses(or_options_t *options, int validate_only, char **msg)
   return 0;
 }
 
+/** Load one of the geoip files, <a>family</a> determining which
+ * one. Note that <a>fname</a> will be freed by this
+ * function. <a>default_fname</a> is used if on Windows and
+ * <a>fname</a> equals "<default>". */
 static void
 config_load_geoip_file_(sa_family_t family,
                         char *fname, /* will be freed */
@@ -5584,6 +5588,8 @@ config_load_geoip_file_(sa_family_t family,
     tor_free(fname);
 }
 
+/** Load geoip files for IPv4 and IPv6 if <a>options</a> and
+ * <a>old_options</a> indicate we should. */
 static void
 config_maybe_load_geoip_files_(const or_options_t *options,
                                const or_options_t *old_options)





More information about the tor-commits mailing list