commit 1137817319c7a9e4293e9901405d01e7b85da6ea Merge: 73a0bb1 6eb7f2f Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 10 10:55:24 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/bug9928 | 6 ++++++ src/common/util.c | 10 +++++----- 2 files changed, 11 insertions(+), 5 deletions(-)