commit dd749798a436688cbbe3fc23fe6d4f5041a3e015 Merge: 3ed4c5d 679aa93 Author: Nick Mathewson nickm@torproject.org Date: Wed May 16 12:15:35 2012 -0400

Merge branch 'bug5346_squashed' into maint-0.2.2

changes/bug5346 | 8 +++++++ src/common/util.c | 26 +++++++++++++++--------- src/test/test_util.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 10 deletions(-)