commit e2c881487cab57b1b4301560f10b4e3ff4a44167 Merge: 8a767ba f12aad7 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 21 12:40:08 2016 -0500

Merge remote-tracking branch 'arma/bug20423' into maint-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(-)