[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

commit cd3f9572199c254e6c7896b61b361061919021bb Merge: 1f389dadd 75a6e7e25 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jun 29 13:49:43 2018 -0400 Merge branch 'maint-0.3.4' 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(+)