commit a4d5ce435768e1946d1e23e3f77f446c7717e997 Merge: 54bfbc0 ec61ae5 Author: Roger Dingledine arma@torproject.org Date: Thu May 25 00:27:08 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

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