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

[nickm at torproject.org]

commit b73a662a2697dcfe0ee06737cedd2130bdd29129
Merge: a610ebc 1d8bcba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 1 11:11:31 2011 -0400

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

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