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