[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit 9a6514ce4f35bee5e083de39466772f535f7f045
Merge: 294c89f 1b6b8b0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 22 12:41:16 2013 -0400

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

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