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

[nickm at torproject.org]

commit 6f200b61b7effe811809fe60459b0b5b58cb3dbb
Merge: 2527acb 6cac100
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 23 02:16:25 2011 -0400

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

 src/common/procmon.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)