[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

commit f6b30a97a96837e012b296a43cc99018d96bcf13 Merge: 5ab23e03f f82f8179e Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

changes/ticket26467 | 3 +++ src/or/directory.c | 1 + src/or/hs_descriptor.c | 1 + src/test/hs_test_helpers.c | 6 ++++++ src/test/test_channelpadding.c | 2 ++ src/test/test_hs_descriptor.c | 11 +++++------ 6 files changed, 18 insertions(+), 6 deletions(-)