commit 0f9e6c74ffc13eb1c5dd3a5cab4793ffc1681825 Merge: effeb36 89ec191 Author: Nick Mathewson nickm@torproject.org Date: Tue Nov 8 18:51:15 2016 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug20306_029 | 4 ++++ src/or/policies.c | 37 +++++++++++++++++-------------------- src/or/policies.h | 3 ++- src/or/router.c | 4 ++-- src/or/routerparse.c | 2 +- src/test/test_policy.c | 18 ++++++++++-------- 6 files changed, 36 insertions(+), 32 deletions(-)