commit fc5242889c921ac1322ca0b22a72f81df58d49b5 Merge: d136e91ed ea14d3408 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:06:15 2018 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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