[or-cvs] r14931: forward-port r14930 (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-04 03:41:22 -0400 (Wed, 04 Jun 2008)
New Revision: 14931

Modified:
   tor/trunk/src/or/geoip.c
Log:
forward-port r14930


Modified: tor/trunk/src/or/geoip.c
===================================================================
--- tor/trunk/src/or/geoip.c	2008-06-04 07:40:59 UTC (rev 14930)
+++ tor/trunk/src/or/geoip.c	2008-06-04 07:41:22 UTC (rev 14931)
@@ -387,7 +387,7 @@
 #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;