Merge branch 'maint-0.2.9' into maint-0.3.2

diff --cc src/test/test.c
index 383bc000022947b2a81a559475dc0b060080dc23,6330eb9b93b549ce73272e3c51645f7dd711332a..a935ac36a6c2cfe034f73f166386bf0df02b50d6
--- 1/src/test/test.c
--- 2/src/test/test.c
+++ b/src/test/test.c
@@@ -20,8 -20,10 +20,10 @@@
  #include <direct.h>
  #else
  #include <dirent.h>
 -#endif
 +#endif /* defined(_WIN32) */
  
+ #include <math.h>
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
  #define GEOIP_PRIVATE