commit ffc21b653f08e3826867c14d44d6543d262bb417 Merge: fe68a80 3a9351b Author: Nick Mathewson nickm@torproject.org Date: Thu May 31 00:07:52 2012 -0400

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

(For bug 5969 fix)

changes/bug5969_022 | 7 +++++++ src/common/compat.h | 5 +++-- src/common/log.c | 7 +++++++ src/common/util.h | 6 +++++- src/or/control.c | 16 +++++++++++++--- 5 files changed, 35 insertions(+), 6 deletions(-)

diff --cc src/common/compat.h index b0ef63b,fc70caf..7edd889 --- 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) {