commit 58680d04299ab69ea99ee86c5f1a194f44fc1d12 Merge: 6657fe1 946ccf3 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 17 11:16:24 2017 -0400

Merge branch 'ahf_bugs_21641_squashed'

changes/bug21641 | 5 +++ src/or/config.c | 2 +- src/or/main.c | 39 +++++++++++++++++++---- src/or/or.h | 23 ++++++++++++-- src/or/router.c | 90 +++++++++++++++++++++++++++++++++++++++++++++++++++-- src/or/router.h | 3 ++ src/test/test_dir.c | 2 +- 7 files changed, 152 insertions(+), 12 deletions(-)