[tor-commits] [tor/master] Merge branch 'bug6379' into maint-0.2.3

[nickm at torproject.org]

commit 97602c9de432cc1d49d4441de858ab73b8bf41c0
Merge: e9172e5 4c8fcba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 17 13:57:07 2012 -0400

    Merge branch 'bug6379' into maint-0.2.3

 changes/bug6379                   |    6 +++++
 configure.in                      |    1 +
 src/common/OpenBSD_malloc_Linux.c |   40 ++++++++++++++++++++++++++++--------
 3 files changed, 38 insertions(+), 9 deletions(-)