[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/887'

[nickm at torproject.org]

commit d549440124be04986cc7a2b8cb98bd878fca5532
Merge: f8dc935fb b2eced6c0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 11 14:29:16 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/887'

 changes/bug30002                |  2 ++
 src/test/test_key_expiration.sh | 14 +++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)