commit c470a6d278c6340c2e2d10cac0796e6041b88dee Merge: 1432cc842 f1a5000b9 Author: Nick Mathewson nickm@torproject.org Date: Wed Dec 6 14:44:03 2017 -0500

Merge remote-tracking branch 'teor/bug24488'

changes/bug24488 | 4 ++++ src/or/dirserv.c | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-)