commit aad71eef1b8cf5e6dd74371abc012b342ec3f011 Merge: 8e5d3ca 2703e07 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 25 11:59:33 2012 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' src/common/util.c | 34 ++++++++++++++++++++++++---------- src/common/util.h | 4 ++-- src/test/test_util.c | 16 +++++++++++----- 3 files changed, 37 insertions(+), 17 deletions(-)