[tor-commits] [tor/master] Merge remote-tracking branch 'rl1987/bug25852_take2'

commit d27fd7ff6bea7f68dfbf89a38219dbb302f45bf1 Merge: aab626405 036df13a0 Author: Nick Mathewson nickm@torproject.org Date: Mon May 14 14:05:50 2018 -0400

Merge remote-tracking branch 'rl1987/bug25852_take2'

changes/bug25852 | 5 +++ src/or/policies.c | 26 +++++++------ src/or/router.c | 102 ++++++++++++++++++++++++++++++++++++++++++++++--- src/or/router.h | 11 ++++++ src/test/test_policy.c | 66 +++++++++++++++++++++++++++++++- 5 files changed, 191 insertions(+), 19 deletions(-)