commit 9379984128365487d732a89a851a1132b8edbfa0 Merge: dff390d bed94a9 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 09:24:08 2017 -0500

Merge branch 'teor_bug21357-v2_029' into maint-0.2.9

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(-)