commit 4e76b206b5fac18805a5cb2c3440dd367bd3b92d Merge: e1f4d95 c4208ef Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 29 08:06:21 2016 -0400

Merge remote-tracking branch 'arma/feature18624'

changes/feature18624 | 7 +++++++ src/or/dirserv.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)