commit de8e0ef0bd03607f444c967d8c3d74aa8abee4b8 Merge: 4ac8ff9 83fe07d Author: Nick Mathewson <nickm@torproject.org> Date: Sun May 15 22:15:06 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3175 | 7 +++++++ src/common/container.c | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-)