commit a08bbefa9b6d9bf9693ea63e212d7817228e4a3d Merge: f96f319 4a7e412 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 22 22:23:20 2012 -0400

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

changes/bug5557 | 3 + src/common/util.c | 148 ++++++++++++++++++++++++++++++++++++++++++-------- src/common/util.h | 2 + src/test/test_util.c | 49 +++++++++++++++-- 4 files changed, 173 insertions(+), 29 deletions(-)