[tor-commits] [tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 6e0872e8672ed18f8c250cdcbdfd3d7bf047c076
Merge: ced350882 e01ea64f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 23 19:36:45 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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

diff --cc src/test/test.c
index f0e8b9b72,2e7d39932..aea3ad659
--- 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