commit 90894c87a542c8671b4fb13d8e088e1e5c89d9b6 Merge: 0698a0b 5c52d3c Author: Nick Mathewson <nickm@torproject.org> Date: Mon May 22 08:32:18 2017 -0400 Merge branch 'maint-0.3.0' changes/bug20509 | 5 +++++ src/or/dirserv.c | 11 +++++++++++ 2 files changed, 16 insertions(+)