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

[nickm at torproject.org]

commit 8f21838ee5305b89c4089a06ca51e95bc89ae053
Merge: 9c58905 7d3fd85
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 8 13:01:58 2013 -0400

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

 changes/bug8845        |    3 +++
 src/test/test_crypto.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)