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

Conflicts:
	src/test/test_util.c

diff --cc src/common/util.c
Simple merge

diff --cc src/common/util.h
Simple merge

diff --cc src/or/directory.c
Simple merge

diff --cc src/or/dirvote.c
Simple merge

diff --cc src/test/test_util.c
index 9eca90492d5afaae5bdb696eda7baf8fa5471d38,12e3fa97935cfb3708763b1b6be1cc77dfbec458..4f9eb73e03713a8804bca8d786d5f9f360083d62
--- 1/src/test/test_util.c
--- 2/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)
  {