From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 23 Aug 2018 23:36:45 +0000 (-0400)
Subject: Merge branch 'maint-0.3.3' into maint-0.3.4
X-Git-Tag: tor-0.3.4.7-rc~9^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6e0872e8672ed18f8c250cdcbdfd3d7bf047c076;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.3' into maint-0.3.4
---

6e0872e8672ed18f8c250cdcbdfd3d7bf047c076
diff --cc src/test/test.c
index f0e8b9b728,2e7d399322..aea3ad6595
--- a/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