[tor-commits] [tor/maint-0.3.4] Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2

[nickm at torproject.org]

commit 209332e71ab5a7633ee0c934be017740f3e9552a
Merge: 312a42fc8 449d190e2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 19 08:30:59 2018 -0400

    Merge remote-tracking branch 'teor/bug26853_032' into maint-0.3.2

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