From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 13 Aug 2014 19:01:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/use_calloc'
X-Git-Tag: tor-0.2.6.1-alpha~208
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9114346d323f3fe7c261bfcee89556bab4f88d48;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/use_calloc'
---

9114346d323f3fe7c261bfcee89556bab4f88d48