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

[arma at torproject.org]

commit 83439e78cc08f5a05d314de4409e69aa6d1601d7
Merge: 5c52d3c ec61ae5
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu May 25 00:27:27 2017 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.0

 changes/bug22370 | 4 ++++
 src/or/dirserv.c | 7 ++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)