commit c7912909e3d79ed65684b6430eb524d4bbae54de Merge: d67c665 3a7d757 Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 14 09:11:14 2017 -0400 Merge branch 'maint-0.2.9' into release-0.2.9 changes/bug22916_027 | 3 +++ src/test/test_crypto_slow.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)