diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-02-28 08:32:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-02-28 08:32:13 -0500 |
| commit | 043329eeb653b2f9e795cf8b7cfd8fb0b756dca5 (patch) | |
| tree | 254725973497821e9de8390f9a0048d9736097b1 /src/or/geoip.c | |
| parent | bf1678603ffa66ed47c038faf309984839a98363 (diff) | |
| parent | b7d8a1e141479add9f591e4e9fc3da15baecaecd (diff) | |
| download | tor-043329eeb653b2f9e795cf8b7cfd8fb0b756dca5.tar.gz tor-043329eeb653b2f9e795cf8b7cfd8fb0b756dca5.zip | |
Merge remote-tracking branch 'karsten/task-5824'
Diffstat (limited to 'src/or/geoip.c')
| -rw-r--r-- | src/or/geoip.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/or/geoip.c b/src/or/geoip.c index 6088f5d194..2e39fe0eb7 100644 --- a/src/or/geoip.c +++ b/src/or/geoip.c @@ -556,8 +556,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; } |