commit 9114346d323f3fe7c261bfcee89556bab4f88d48 Merge: 938deec 4570805 Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 13 15:01:04 2014 -0400

Merge remote-tracking branch 'public/use_calloc'

changes/bug12855 | 5 +++++ scripts/coccinelle/calloc.cocci | 20 ++++++++++++++++++++ src/common/compat.c | 4 ++-- src/common/container.c | 5 +++-- src/common/container.h | 4 ++-- src/common/crypto.c | 4 ++-- src/common/util.c | 20 +++++++++++++++++--- src/common/util.h | 3 +++ src/or/circuitbuild.c | 2 +- src/or/circuitstats.c | 10 +++++----- src/or/config.c | 4 ++-- src/or/cpuworker.c | 2 +- src/or/dirserv.c | 12 ++++++------ src/or/dirvote.c | 36 ++++++++++++++++++------------------ src/or/geoip.c | 4 ++-- src/or/rendcommon.c | 2 +- src/or/rephist.c | 11 ++++------- src/or/routerlist.c | 12 ++++++------ src/test/test_pt.c | 2 +- src/test/test_util.c | 2 +- 20 files changed, 102 insertions(+), 62 deletions(-)