Bridge relays no longer print "xx=0" in their extrainfo document

for every single country code in the geoip db.


svn:r14930

2 files changed, 4 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8a633170f3..f6a99890b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
 Changes in version 0.2.0.28-rc - 2008-06-??
   o Minor fixes:
-    - Fix unit tests in 0.2.0.27-rc. [Actually, one is still broken!]
+    - Bridge relays no longer print "xx=0" in their extrainfo document
+      for every single country code in the geoip db.
+    - Fix unit tests in 0.2.0.27-rc.
     - Fix compile on Windows.
 
 
diff --git a/src/or/geoip.c b/src/or/geoip.c
index c8c009373b..7d4e883bef 100644
--- a/src/or/geoip.c
+++ b/src/or/geoip.c
@@ -362,7 +362,7 @@ geoip_get_client_history(time_t now)
 #if MIN_IPS_TO_NOTE_COUNTRY > 0
       if (c >= MIN_IPS_TO_NOTE_COUNTRY) {
 #else
-      if (1) {
+      if (c > 0) {
 #endif
         /* Round up to the next multiple of IP_GRANULARITY */
         c += IP_GRANULARITY-1;