Merge branch 'maint-0.3.3' into maint-0.3.4

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

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

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

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