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

[nickm at torproject.org]

commit 93d3a917e878e42950faf6199205a6933a40c900
Merge: ee717f3 676bba8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 18 14:45:18 2012 -0500

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

 changes/bug4012_022 |    3 +++
 doc/tor.1.txt       |    4 ++++
 2 files changed, 7 insertions(+), 0 deletions(-)