From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 31 May 2012 04:07:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.16-alpha~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ffc21b653f08e3826867c14d44d6543d262bb417;p=thirdparty%2Ftor.git

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

(For bug 5969 fix)
---

ffc21b653f08e3826867c14d44d6543d262bb417
diff --cc src/common/compat.h
index b0ef63badf,fc70caf50c..7edd889ee3
--- a/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)
  {