[tor-commits] [tor/master] Merge remote-tracking branch 'public/ticket6789'

[nickm at torproject.org]

commit 4319f998283d33af61b1855b7fa287fa93113dbd
Merge: 7ff5c3f 26cee96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 10 15:31:04 2012 -0400

    Merge remote-tracking branch 'public/ticket6789'

 changes/bug6789  |    7 +++++++
 src/or/dirserv.c |   14 +++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)