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

[nickm at torproject.org]

commit f2c6c5e69c5accb62b8a19839fd6b2defd470919
Merge: a53e9bf a4b4476
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Mar 23 00:18:11 2014 -0400

    Merge branch 'ticket11149'

 changes/require_023 |    6 ++++++
 src/or/dirserv.c    |   11 +++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)