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

[nickm at torproject.org]

commit 343a694344ce93bc2b4f681b40708391fa80b957
Merge: 8fda6b2 dff390d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:23:04 2017 -0500

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug21108_029 | 6 ++++++
 src/or/dirserv.c     | 6 +++++-
 2 files changed, 11 insertions(+), 1 deletion(-)