Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-12-07 18:26:43 -05:00
commit 38daa8f3cc

View File

@ -21,6 +21,11 @@
#include "torlog.h"
#include "util.h"
#ifdef __APPLE__
#undef CLOCK_MONOTONIC
#undef HAVE_CLOCK_GETTIME
#endif
/** Wraps a void (*)(void*) function and its argument so we can
* invoke them in a way pthreads would expect.
*/