[tor-commits] [tor/master] Merge remote-tracking branch 'arma/feature18760'

[nickm at torproject.org]

commit 3c6f059e6aa5e4b7937f364cc0101229b6386818
Merge: e9e6a1f 0aacc07
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 11 13:22:31 2016 -0400

    Merge remote-tracking branch 'arma/feature18760'

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