commit d3c05a79f0b3e688e43edfffe9886664777517f7 Merge: 12b1d64 5470795 Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 25 01:24:39 2014 -0400

Merge branch 'scanbuild_fixes'

changes/bug8793 | 9 +++++++++ src/common/address.c | 4 +++- src/common/compat.c | 4 +++- src/common/memarea.c | 7 ++----- src/ext/ht.h | 6 ++++-- src/ext/tinytest.c | 9 ++++++++- src/or/buffers.c | 2 +- src/or/circuitbuild.c | 4 ++-- src/or/circuitlist.c | 12 ++++++++++-- src/or/circuitmux.c | 6 +++++- src/or/circuituse.c | 19 ++++++++++++++----- src/or/connection.c | 2 ++ src/or/cpuworker.c | 2 +- src/or/ext_orport.c | 2 +- src/or/onion.c | 6 ++++-- src/or/rendservice.c | 4 ++-- src/test/test_addr.c | 3 +++ src/test/test_oom.c | 4 ++-- src/test/test_policy.c | 6 ++++-- src/tools/tor-gencert.c | 2 ++ 20 files changed, 82 insertions(+), 31 deletions(-)