commit 5c52d3c2c05a42c9535789d335a51f09a7855d68 Merge: d1340bd 6e5486b Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 22 08:32:07 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug20509 | 5 +++++ src/or/dirserv.c | 11 +++++++++++ 2 files changed, 16 insertions(+)