commit 7b1b8c36942a09ff4c50ac228f465aa4050153e3 Merge: 1137817 004a9c6 Author: Nick Mathewson nickm@torproject.org Date: Thu Oct 10 11:18:07 2013 -0400

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

src/common/util.c | 4 ++-- src/test/test_util.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)