[tor-commits] [tor/maint-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1

[nickm at torproject.org]

commit 52c1754ff6b7f181ab40d1f3148ed6a28d60cef5
Merge: bbc75fa f5d2f79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 14 09:11:14 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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