commit cf61d437da0230aff3a0f1c04b95d17a37a78c88 Merge: b2bb41e02 68dfbd5ef Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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(-)