commit 29269e6ee20023bd3de7227de637dc186f6c9ec1 Merge: 2f4ed3e57 75a6e7e25 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:49:43 2018 -0400

Merge branch 'maint-0.3.4' into release-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(+)