[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 5daa765bd1152aeaa97e68f68bc639c0eac4b01e
Merge: 57ed8fb fe50b67
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 8 14:15:18 2012 -0500

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

 changes/bug5340                   |    3 +++
 src/common/OpenBSD_malloc_Linux.c |    5 ++++-
 2 files changed, 7 insertions(+), 1 deletions(-)