commit eb71777bb28b353da68c0ea25a36d0ac763de550 Merge: bc64a6b d6bfedb Author: Nick Mathewson nickm@torproject.org Date: Wed Sep 2 16:00:07 2015 -0400

Merge remote-tracking branch 'dgoulet/bug15963_026_01'

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