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

[nickm at torproject.org]

commit 97285bc46550ba135a2567d89351159da8db99f8
Merge: 3b6c483 1137817
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 10 10:55:58 2013 -0400

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

 changes/bug9928   |    6 ++++++
 src/common/util.c |   10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)