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

[arma at torproject.org]

commit a8e76de4d997690917432d0d60383a1333f80baa
Merge: a5610cf d819663
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 3 15:38:54 2013 -0400

    Merge branch 'bug9400_024_squashed' into maint-0.2.4

 changes/bug9400     |    7 +++++++
 src/common/compat.c |   14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)