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

[nickm at torproject.org]

commit 7c83d4043d7f336c14a53418ce91b12335626f6b
Merge: 4a7f979 3f7f96d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 19 15:39:04 2011 -0400

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

 changes/bug2704_part1 |    5 +++++
 changes/bug2704_part2 |    5 +++++
 src/or/rephist.c      |   21 +++++++++++++++++----
 3 files changed, 27 insertions(+), 4 deletions(-)