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

[nickm at torproject.org]

commit 5b861ae53f411fc577ac603bd7bfcf6cd1ce5fa4
Merge: a32d7e1 c86b709
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 8 12:01:23 2014 -0400

    Merge remote-tracking branch 'public/bug11648'

 changes/bug11648 |    8 ++++++++
 src/or/dirserv.c |   14 ++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)