Merge branch 'maint-0.2.9'

changes/bug20306_029

src/or/policies.c

src/or/policies.h

src/or/router.c

src/or/routerparse.c

src/test/test_policy.c