[tor-commits] [tor/master] Merge branch 'bug22916_027' into maint-0.2.9

[nickm at torproject.org]

commit 3a7d757140c344986fba5769b47dc10d925fe119
Merge: ed0fb21 3cec178
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 14 09:11:08 2017 -0400

    Merge branch 'bug22916_027' into maint-0.2.9

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