commit 84ddc4b6aad392dd9a735580caf6fb68e3694d42 Merge: 648db9a efb8a09 Author: Nick Mathewson nickm@torproject.org Date: Fri May 11 11:45:40 2012 -0400

Merge remote-tracking branch 'public/bug5091'

changes/bug5091 | 4 +++ src/common/compat.c | 30 +++++++++++++++++---- src/test/test_util.c | 70 ++++++++++++++++++++++++++++++++----------------- 3 files changed, 74 insertions(+), 30 deletions(-)