[tor-commits] [tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2

[arma at torproject.org]

commit b3820e0d03b1b54575c1b5d946180581e281798d
Merge: 17f873a 1d6af67
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Mar 4 00:43:20 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 doc/tor.1.txt    |    2 +-
 src/or/rephist.c |   12 +++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)