commit 55817c4c5065a7689e17c329b3f4695b6d888220 Merge: b349f09 d1dc23c Author: Nick Mathewson nickm@torproject.org Date: Fri Apr 5 16:53:07 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug8638 | 3 +++ src/test/test.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 4 deletions(-)