From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 11 Sep 2012 17:20:15 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
X-Git-Tag: tor-0.2.3.22-rc~3^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5833861f62d2667eeda1ed0f6595763aa00250b0;p=thirdparty%2Ftor.git

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

Conflicts:
	src/test/test_util.c
---

5833861f62d2667eeda1ed0f6595763aa00250b0
diff --cc src/test/test_util.c
index 9eca90492d,12e3fa9793..4f9eb73e03
--- 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)
  {