[tor-commits] [tor/master] Merge branch 'teor_bug21357-v2_029'

commit f1530d0e5a66f61c1d9f287cf0ae79f377b7d026 Merge: c3b6354 bed94a9 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Feb 1 09:39:25 2017 -0500 Merge branch 'teor_bug21357-v2_029' changes/bug21357 | 7 + src/or/policies.c | 95 +++++++-- src/or/policies.h | 3 + src/test/test_policy.c | 534 +++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 609 insertions(+), 30 deletions(-)