[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.2.9' into maint-0.3.2

commit 36bb11a65081bb0c2a2a86359c6386bde67f8046 Merge: c1ad40627 cc4ea34a2 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 23 19:36:45 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.2

changes/bug27185 | 3 +++ src/test/test.c | 10 ++-------- 2 files changed, 5 insertions(+), 8 deletions(-)

diff --cc src/test/test.c index 383bc0000,6330eb9b9..a935ac36a --- 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