commit 997499369e8f2e022d2d923fa10e54a9370c1e1e Merge: 8b26554 1040cca Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 20 15:28:16 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/util.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-)