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

[nickm at torproject.org]

commit 2725a88d5e3ec362a4f866f53c26ca20f943eb49
Merge: 05f672c 103c861
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 3 15:19:00 2011 -0400

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

 changes/windows_8   |    5 +++++
 src/common/compat.c |    3 ++-
 2 files changed, 7 insertions(+), 1 deletions(-)