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

[nickm at torproject.org]

commit 86197dfd4f8a72698bdfa40b84cdb8787f6f94ce
Merge: 05dd0a9 6330d2d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 26 11:04:43 2012 -0400

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

 changes/bug6227      |    3 +++
 src/test/test_util.c |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)