[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 54bfbc08ce2d756c3f40549dd9e7ae4222e34c20
Merge: 480aa72 6e5486b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 22 08:31:46 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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