Merge branch 'maint-0.2.9'

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

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

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

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

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

diff --cc src/or/routerparse.h
Simple merge

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