[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm at torproject.org]

commit 94871f75d7629bede0a028446865f6ca53b47bd3
Merge: 02e1e8a51 209332e71
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 19 08:31:07 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug26853                | 3 +++
 src/test/test_key_expiration.sh | 8 ++++++++
 2 files changed, 11 insertions(+)