commit 6330d2d9e6dc8cdeceea9486ad96e57487d6d232 Merge: 5fad3dc 4645f28 Author: Nick Mathewson nickm@torproject.org Date: Tue Jun 26 11:03:56 2012 -0400

Merge remote-tracking branch 'public/bug6227' into maint-0.2.3

changes/bug6227 | 3 +++ src/test/test_util.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-)