[tor-commits] [tor/master] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit 36c372581f8d7651c336f69b9b1b051d3d31d548
Merge: 92b4996b2 ed84dab8b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:49:43 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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