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

[nickm at torproject.org]

commit 9905289fe99382d20507adbc57e112729399eb42
Merge: f94e66e8d 27f5bd52f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 19 08:31:07 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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