Merge branch 'maint-0.2.9' into maint-0.3.1

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

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