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

Merge branch 'maint-0.2.9' into maint-0.3.2
---

36bb11a65081bb0c2a2a86359c6386bde67f8046
diff --cc src/test/test.c
index 383bc00002,6330eb9b93..a935ac36a6
--- a/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