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

[arma at torproject.org]

commit 92862c6d48026811c32d3e603524185778d0b4d7
Merge: d487d6f 688903e
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Feb 2 02:32:44 2012 -0500

    Merge branch 'maint-0.2.2'

 changes/bug5005 |    3 +++
 doc/tor.1.txt   |   11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)