commit 71bcba4704bbf20bf4676e35a0c3cfa9b8bc4df6 Merge: fcfe16197 ed84dab8b Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

src/test/test_channelpadding.c | 1 + src/test/test_hs_descriptor.c | 3 +++ src/test/test_shared_random.c | 1 + 3 files changed, 5 insertions(+)