[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug4788' into maint-0.2.2

[arma at torproject.org]

commit 84bf8e3808d5f10e5ffd0d9f9f31760c6d3875ab
Merge: c563551 9bcb187
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Dec 28 16:50:45 2011 -0500

    Merge remote-tracking branch 'public/bug4788' into maint-0.2.2

 changes/bug4788  |    6 ++++++
 src/or/dirserv.c |   23 ++++++++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)