[tor-commits] [tor/master] Merge branch 'calloc2'

[nickm at torproject.org]

commit 1b93195a8109bcafe543d71c4f49c92087ccc17f
Merge: f179ff1 bbd8d07
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Nov 2 12:03:11 2014 -0500

    Merge branch 'calloc2'

 scripts/coccinelle/calloc.cocci |   15 ++++++-----
 src/common/compat.c             |    2 +-
 src/common/util.c               |   53 ++++++++++++++++++++++-----------------
 src/or/circuitbuild.c           |    2 +-
 src/or/circuitstats.c           |    6 ++---
 src/or/config.c                 |    4 +--
 src/or/cpuworker.c              |    2 +-
 src/or/dirserv.c                |   12 ++++-----
 src/or/dirvote.c                |   30 +++++++++++-----------
 src/or/geoip.c                  |    4 +--
 src/or/routerlist.c             |   12 ++++-----
 src/test/test_pt.c              |    2 +-
 12 files changed, 77 insertions(+), 67 deletions(-)