Merge branch 'maint-0.3.4'

changes/ticket26467

src/or/directory.c

src/or/hs_descriptor.c

src/test/hs_test_helpers.c

src/test/test_channelpadding.c

src/test/test_hs_descriptor.c