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

[nickm at torproject.org]

commit 294c89f238df2c7feb1f2fba0bf3a3ad824acfee
Merge: e9ffd98 42fb61d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Mar 21 07:53:46 2013 -0400

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

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