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

(For bug 5969 fix)

diff --cc src/common/compat.h
index b0ef63badfcb8be757d4f81a3483d3a0533e1ff1,fc70caf50cde803cf4d9c0237d9148d7e619afb0..7edd889ee3aa0c216bf69040eb4ca80ed0b05fe7
--- 1/src/common/compat.h
--- 2/src/common/compat.h
+++ b/src/common/compat.h
@@@ -263,12 -265,13 +263,13 @@@ int tor_vsnprintf(char *str, size_t siz
  
  int tor_asprintf(char **strp, const char *fmt, ...)
    CHECK_PRINTF(2,3);
- int tor_vasprintf(char **strp, const char *fmt, va_list args);
+ int tor_vasprintf(char **strp, const char *fmt, va_list args)
+   CHECK_PRINTF(2,0);
  
  const void *tor_memmem(const void *haystack, size_t hlen, const void *needle,
 -                       size_t nlen)  ATTR_PURE ATTR_NONNULL((1,3));
 +                       size_t nlen) ATTR_NONNULL((1,3));
  static const void *tor_memstr(const void *haystack, size_t hlen,
 -                           const char *needle) ATTR_PURE ATTR_NONNULL((1,3));
 +                           const char *needle) ATTR_NONNULL((1,3));
  static INLINE const void *
  tor_memstr(const void *haystack, size_t hlen, const char *needle)
  {

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

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

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