Merge branch 'teor_bug21357-v2_029'

diff --cc src/or/policies.c
Simple merge

diff --cc src/test/test_policy.c
Simple merge