summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changes/bug5824-24
-rw-r--r--src/or/geoip.c5
2 files changed, 7 insertions, 2 deletions
diff --git a/changes/bug5824-2 b/changes/bug5824-2
new file mode 100644
index 0000000000..f5963ca4c8
--- /dev/null
+++ b/changes/bug5824-2
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Bridges now report complete directory request statistics. Related to
+ bug 5824; bugfix on 0.2.2.1-alpha.
+
diff --git a/src/or/geoip.c b/src/or/geoip.c
index dc4730c810..c62fee4e90 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -554,8 +554,9 @@ geoip_note_client_seen(geoip_client_action_t action,
(!(options->BridgeRelay && options->BridgeRecordUsageByCountry)))
return;
} else {
- if (options->BridgeRelay || options->BridgeAuthoritativeDir ||
- !options->DirReqStatistics)
+ /* Only gather directory-request statistics if configured, and
+ * forcibly disable them on bridge authorities. */
+ if (!options->DirReqStatistics || options->BridgeAuthoritativeDir)
return;
}