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

[nickm at torproject.org]

commit ff02ea65ecb40069ba2023c331c5b60fa5ef2b02
Merge: 4f26c67d4 e658dad62
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 13 08:50:58 2018 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/ticket25170 |  5 +++++
 src/or/dirserv.c    | 10 ++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)