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

commit 5d87e0eb47830b7443cac243dbac2d9ab9fb8517 Merge: 33c5470 e2c8814 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 21 12:44:12 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20423 | 6 ++++++ src/or/control.c | 2 +- src/or/dirserv.c | 3 ++- src/or/router.c | 39 +++++++++++++++++++++++++-------------- src/or/router.h | 3 ++- src/or/transports.c | 2 +- src/test/test_config.c | 4 +++- 7 files changed, 40 insertions(+), 19 deletions(-)