[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit e66c30e47c02c0243aba1935a06e95188210e84d
Merge: 343a694 9379984
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Feb 7 09:24:23 2017 -0500

    Merge branch 'maint-0.2.9' into release-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(-)