commit 419077c26da1e50ed5671c69ec446a3eb60a8303 Merge: 1385a5118 8550016e6 Author: Nick Mathewson nickm@torproject.org Date: Fri Jun 29 13:06:08 2018 -0400

Merge remote-tracking branch 'ahf-github/maint-0.3.1' into maint-0.3.1

src/or/directory.c | 1 + src/test/hs_test_helpers.c | 6 ++++++ src/test/test_channelpadding.c | 2 ++ 3 files changed, 9 insertions(+)