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

[nickm at torproject.org]

commit 3890c81e7c4eaa3350fe569dbc2fbf97e824e4c0
Merge: 281aa2e fbf1c5e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 23 16:28:18 2011 -0500

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

 changes/bug4230        |    5 +++++
 src/common/container.c |   19 ++++++++++++++-----
 2 files changed, 19 insertions(+), 5 deletions(-)