commit 3d817fa29cb9a0f58dd641aabf7f34301bf5809d Merge: 97285bc 7b1b8c3 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Oct 10 11:18:17 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' src/common/util.c | 4 ++-- src/test/test_util.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-)