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

commit 535affe65692f6b00534e97d0c97cae67883a93a Merge: 499612420 a321d7240 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 18 15:01:07 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug26485 | 4 ++++ src/or/config.c | 9 ++++++++- src/or/dirserv.c | 43 +++++++++++++++++++++++++++++++++++++------ src/or/dirserv.h | 3 +-- src/or/dirvote.c | 9 ++++++++- src/test/test_dir.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 110 insertions(+), 11 deletions(-)