commit dff390dcc73d0af3fc1322e035f1021b988232bf Merge: 3e5b1c2 6ff7850 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 09:22:31 2017 -0500

Merge branch 'bug21108_029' into maint-0.2.9

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