[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2

[nickm at torproject.org]

commit 6d595fa4cf679cf7c66673726596548758a298bc
Merge: 676bba8 dd4b1a2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 15:29:25 2012 -0500

    Merge remote-tracking branch 'public/bug4533_part2' into maint-0.2.2

 changes/bug4533_part2 |    5 +++++
 src/common/compat.h   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)