commit 4db33ecc04ef2ad8bb7ef04d8c67b3ae4a46d8bf Merge: 5eefa43 52c1754 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)