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

[arma at torproject.org]

commit d34a5cdc597824e72453009ed209e5644f158e90
Merge: 600ad7b 3a0c602
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 11 23:30:25 2011 -0500

    Merge branch 'hsdir_assignment' into maint-0.2.2

 changes/hsdir_assignment |    8 ++++++++
 src/or/dirserv.c         |   19 ++++++++++++++++++-
 src/or/rephist.c         |   14 ++++++++++++++
 src/or/rephist.h         |    1 +
 4 files changed, 41 insertions(+), 1 deletions(-)