commit 44620d3b6b4909c355b5e305cf2137fa841e37a6 Merge: 36801ba b99457d Author: Roger Dingledine arma@torproject.org Date: Tue Oct 23 22:06:09 2012 -0400

Merge branch 'maint-0.2.3' into release-0.2.3

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