[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug7191_v2'

[nickm at torproject.org]

commit 04a509e04b0e22530e6a1a81c1a0884ad7010eb0
Merge: 9064238 500ebdb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 23 21:51:38 2012 -0400

    Merge remote-tracking branch 'andrea/bug7191_v2'

 changes/bug7191            |    3 +
 src/common/container.c     |  112 +++++++++++++++++++++++++++++++++++++-------
 src/test/test_containers.c |   36 ++++++++++++++
 3 files changed, 134 insertions(+), 17 deletions(-)