[tor-commits] [tor/master] Merge remote-tracking branch 'linus/bug6621'

[nickm at torproject.org]

commit d517233e71139e60a1050ca86586f4cf3857b792
Merge: 661bd3f b1c4b3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 21 10:21:53 2012 -0400

    Merge remote-tracking branch 'linus/bug6621'

 src/or/dirserv.c |   21 +++++++++++++++++----
 1 files changed, 17 insertions(+), 4 deletions(-)