commit 5833861f62d2667eeda1ed0f6595763aa00250b0 Merge: 8731a4e 84f47ff Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 11 13:20:15 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3

Conflicts: src/test/test_util.c

changes/bug6811 | 5 +++++ src/common/util.c | 27 +++++++++++++-------------- src/common/util.h | 2 +- src/or/directory.c | 3 ++- src/or/dirvote.c | 6 ++++-- src/test/test_util.c | 13 +++++++++++++ 6 files changed, 38 insertions(+), 18 deletions(-)

diff --cc src/test/test_util.c index 9eca904,12e3fa9..4f9eb73 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@@ -14,10 -13,19 +14,23 @@@ #include "mempool.h" #include "memarea.h"

+#ifdef _WIN32 +#include <tchar.h> +#endif + + /* XXXX this is a minimal wrapper to make the unit tests compile with the + * changed tor_timegm interface. */ + static time_t + tor_timegm_wrapper(const struct tm *tm) + { + time_t t; + if (tor_timegm(tm, &t) < 0) + return -1; + return t; + } + + #define tor_timegm tor_timegm_wrapper + static void test_util_time(void) {