[tor-commits] [tor/master] Merge branch 'maint-0.3.1'

[nickm at torproject.org]

commit 4984d6242af07b3e6b7d64dd2d82ada3fee564a2
Merge: 7b23640 e111cfc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 12 09:24:01 2017 -0400

    Merge branch 'maint-0.3.1'

 changes/bug22892            | 4 ++++
 src/test/test_crypto_slow.c | 3 +++
 2 files changed, 7 insertions(+)