[tor-commits] [tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1

[nickm at torproject.org]

commit 1d43779960cb02d3bd176207044c97a80696dd55
Merge: fc5242889 a3ec89a4f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 29 13:49:43 2018 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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