commit 94b51283954e5bc8d68c8a4bc7e6c168eb82e008 Merge: 647fa4b 5c52d3c Author: Nick Mathewson nickm@torproject.org Date: Mon May 22 08:32:13 2017 -0400

Merge branch 'maint-0.3.0' into release-0.3.0

changes/bug20509 | 5 +++++ src/or/dirserv.c | 11 +++++++++++ 2 files changed, 16 insertions(+)