forward-port r14930

svn:r14931

src/or/geoip.c

@@ -387,7 +387,7 @@ geoip_get_client_history(time_t now, geoip_client_action_t action)
 #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;