Merge branch 'maint-0.4.6'

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

diff --cc src/core/or/protover.h
Simple merge

diff --cc src/feature/dirauth/dirvote.c
Simple merge

diff --cc src/feature/dirauth/dirvote.h
Simple merge

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