commit 851197f11d8d602de5c6487d79a21339a587ebb6 Merge: eec8693 97602c9 Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 14:04:28 2012 -0400

Merge remote-tracking branch 'origin/maint-0.2.3'

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