[tor-commits] [tor/release-0.2.4] Merge branch 'bug8587_v3' into maint-0.2.4

[arma at torproject.org]

commit a1178cdbcf1f99715204567152635a57c705af0e
Merge: d028c00 85e7de6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 18:12:44 2013 -0400

    Merge branch 'bug8587_v3' into maint-0.2.4

 changes/bug8587 |    5 +++++
 configure.ac    |   44 ++++++++++++++++++++++++++------------------
 2 files changed, 31 insertions(+), 18 deletions(-)