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

[nickm at torproject.org]

commit 1065a5ef2987e910d10cfcc74eab35dcb4bbf74e
Merge: ad35b8f 330116f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 5 21:54:04 2011 -0400

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

 doc/HACKING         |    8 +++-----
 src/common/compat.c |    1 -
 src/or/rendclient.c |    2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)