From f5f9c2554601e51157d8b563f124cea3fd3d98d4 Mon Sep 17 00:00:00 2001
From: Neel Chauhan <neel@neelc.org>
Date: Thu, 5 Apr 2018 08:35:21 -0400
Subject: Switch to use should_record_bridge_info()

Both in geoip_note_client_seen() and options_need_geoip_info(), switch from
accessing the options directly to using the should_record_bridge_info() helper
function.

Fixes #25290

Signed-off-by: David Goulet <dgoulet@torproject.org>
---
 src/or/geoip.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/or/geoip.c')

diff --git a/src/or/geoip.c b/src/or/geoip.c
index 572bba577f..2c917c564d 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -628,8 +628,7 @@ geoip_note_client_seen(geoip_client_action_t action,
     /* Only remember statistics if the DoS mitigation subsystem is enabled. If
      * not, only if as entry guard or as bridge. */
     if (!dos_enabled()) {
-      if (!options->EntryStatistics &&
-          (!(options->BridgeRelay && options->BridgeRecordUsageByCountry))) {
+      if (!options->EntryStatistics && !should_record_bridge_info(options)) {
         return;
       }
     }
-- 
cgit v1.2.3-54-g00ecf