From 5f03d6c547629af73dea2cfdaf888bc3a7caab5d Mon Sep 17 00:00:00 2001
From: Karsten Loesing <karsten.loesing@gmx.net>
Date: Tue, 26 May 2009 21:41:42 +0200
Subject: Fix bug 932 even more.

Ignore connections two hours after switching from bridge to relay or back.
---
 src/or/geoip.c | 3 +++
 1 file changed, 3 insertions(+)

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

diff --git a/src/or/geoip.c b/src/or/geoip.c
index eb0d7e43f4..e1477d4eab 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -308,6 +308,9 @@ geoip_note_client_seen(geoip_client_action_t action,
   if (action == GEOIP_CLIENT_CONNECT) {
     if (!(options->BridgeRelay && options->BridgeRecordUsageByCountry))
       return;
+    /* Did we recently switch from bridge to relay or back? */
+    if (client_history_starts > now)
+      return;
   } else {
 #ifndef ENABLE_GEOIP_STATS
     return;
-- 
cgit v1.2.3-54-g00ecf