commit b0646cc1423d4ea28d68c84e38e90ba8a6cb4e29 Merge: 2ecee3f cb693ef Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 23 21:48:50 2012 -0400

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

changes/bug7191 | 5 +++++ src/common/container.c | 23 ++++++++++++++++++++++- src/test/test_containers.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletions(-)