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

[nickm at torproject.org]

commit 4c9bd06d0d3d0ce8150c065a51fd432c6e689b0c
Merge: 699af20 0ee524b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 4 17:38:33 2011 -0400

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

 changes/bug2379 |    5 +++++
 doc/tor.1.txt   |   16 ++++++++++++++++
 2 files changed, 21 insertions(+), 0 deletions(-)