[tor-commits] [tor/master] Merge branch 'AUTHDIR_NEWDESC_enough_squashed'

[nickm at torproject.org]

commit a17470a6232ce7170c66ff8a1ce75c6081154fb3
Merge: cef802a 76d8c23
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 19 11:35:32 2015 -0500

    Merge branch 'AUTHDIR_NEWDESC_enough_squashed'

 changes/bug14953 |    3 +++
 src/or/dirserv.c |    8 ++++----
 2 files changed, 7 insertions(+), 4 deletions(-)