[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug4230' into maint-0.2.2

[arma at torproject.org]

commit fbf1c5ee79490577ec0b8c68338ba4f872e993b4
Merge: 841247a e1c6431
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 23 16:22:26 2011 -0500

    Merge remote-tracking branch 'public/bug4230' into maint-0.2.2

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