Merge branch 'maint-0.3.3' into maint-0.3.4

diff --cc src/test/test.c
index f0e8b9b728fa9a23a2f46dd152909f666e477dd7,2e7d39932214dfc38010195e651587a6a1ffec33..aea3ad659532071b10c39e485b080b141f830528
--- 1/src/test/test.c
--- 2/src/test/test.c
+++ b/src/test/test.c
@@@ -23,8 -22,11 +23,10 @@@
  #include <dirent.h>
  #endif /* defined(_WIN32) */
  
+ #include <math.h>
+ 
  /* These macros pull in declarations for some functions and structures that
   * are typically file-private. */
 -#define GEOIP_PRIVATE
  #define ROUTER_PRIVATE
  #define CIRCUITSTATS_PRIVATE
  #define CIRCUITLIST_PRIVATE