[tor-commits] [tor/master] Merge remote-tracking branch 'karsten/one-dirauth'

[nickm at torproject.org]

commit cb065a55bd209b9c23bc14119c2403680b087885
Merge: cb28fe4 aae4ebf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 11 10:15:03 2014 -0500

    Merge remote-tracking branch 'karsten/one-dirauth'

 changes/bug10842   |    4 ++++
 src/or/directory.c |    6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)