]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/use_calloc'
authorNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 19:01:04 +0000 (15:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 13 Aug 2014 19:01:04 +0000 (15:01 -0400)

Trivial merge