[tor-commits] [tor/master] Add a comment explaining why we do a certain redundant check

nickm at torproject.org nickm at torproject.org
Mon Apr 9 16:59:19 UTC 2018


commit e58555135a11e1c78b130cb4807d5dc1d1dfe97b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 9 12:58:17 2018 -0400

    Add a comment explaining why we do a certain redundant check
    
    Closes ticket 25291.
---
 src/or/config.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/or/config.c b/src/or/config.c
index 8658a1326..3c3fd46e6 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -2269,6 +2269,11 @@ options_act(const or_options_t *old_options)
     }
     if ((!old_options || !old_options->EntryStatistics) &&
         options->EntryStatistics && !should_record_bridge_info(options)) {
+      /* If we get here, we've started recording bridge info when we didn't
+       * do so before.  Note that "should_record_bridge_info()" will
+       * always be false at this point, because of the earlier block
+       * that cleared EntryStatistics when public_server_mode() was false.
+       * We're leaving it in as defensive programming. */
       if (geoip_is_loaded(AF_INET) || geoip_is_loaded(AF_INET6)) {
         geoip_entry_stats_init(now);
         print_notice = 1;



More information about the tor-commits mailing list