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

[nickm at torproject.org]

commit 699af20e9ad7c9349971c1e6a37bafe908c86b5f
Merge: fac99f0 29f1ffa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 4 17:21:44 2011 -0400

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

 doc/HACKING |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)