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

[nickm at torproject.org]

commit 40288e1e66b82fc0a641afeaad5d102f001f3df1
Merge: 0c0345a bfa75f7
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 20 10:25:56 2011 -0400

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

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