[tor-commits] [tor/master] Merge remote-tracking branch 'asn-github/t-25432'

commit cb083b5d3e21307b2dd762a1e891b71a9bd69eda Merge: 794a25f8c 216bc353d Author: Nick Mathewson nickm@torproject.org Date: Wed Mar 28 14:43:33 2018 -0400

Merge remote-tracking branch 'asn-github/t-25432'

changes/ticket25432 | 6 +++ src/or/dirserv.c | 4 +- src/or/or.h | 4 +- src/or/router.c | 104 ++++++++++++++++++++-------------------------------- src/or/router.h | 18 --------- 5 files changed, 49 insertions(+), 87 deletions(-)