commit 9ece027d6065e09743ac875aa873bf23583c133f Merge: d018bf199 6ed2ad0f0 Author: Nick Mathewson nickm@torproject.org Date: Tue May 1 10:43:40 2018 -0400

Merge remote-tracking branch 'ffmancera-1/bug20522'

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