commit d0816a040dbb9a5e18b76b3fb30011b19f6660b0 Merge: ce5d8c9 52c1754 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 14 09:11:14 2017 -0400

Merge branch 'maint-0.3.1'

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