commit 9665bad777c02cfdd50f7473781a3a070b70c79a Merge: 47982cd e111cfc Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jul 12 09:24:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22892 | 4 ++++ src/test/test_crypto_slow.c | 3 +++ 2 files changed, 7 insertions(+)